removed redundancies, fixed alignment