tidied up the page class