Clean up query code