Refactoring demo