Refactoring demo for main site