SE362 Unit 4 - Refactor Project