Refactoring demo page code and comments.