36 Refactoring demo