Restyling
Bringing it back to full coverage
Refactoring query into its own object