Cleaned code up for project 1 turn in