did some code alignment