Refactoring of page.h/page.cc, no functional changes