CLN: little clean up of alignment special cases code