Phase 0 Week 6: Refactoring