improve readability of queries
Merge pull request #25 from alphagov/cleanup-queries

improve readability of queries