tidy up new page_types code