Cleaning up of Page and some code-cleanup.