#5: Refactoring