Refactoring hey ho!