#4: Refactoring