Continued refactoring demo