Cleaned up and simplified page