#14: Refactoring