Alpha changes to clean up Page class