Simplify Signature
Extract Query to a class
Simplify headers