cleaned up some code alignment