Query Refactoring
Refactoring Query
Refactoring Query
Tiny Refactoring

Removing a magic nil and some refinements on Reek