cleaned up code, deleted unneeded lines