Cleaner way to build query string