Phase 0 Week 6: Exercise 6 (Refactoring)