All Pages: Cleaned up code