code clean up
alignment works for now, code cleanup