better diff alignment