Refactoring page class...