Refactoring question page