Cleaned some code for Phase 1 Task 1