BasePage - Refactor