removed redundancies, cleanup