Day 9 - Refactoring