Refactored suvey queries into its own class