Small cleanup and final commit for project 1