Cleaned up page class