Cleaned up default page code