Cleaned up PagesHelper