Remove defensive guards
Make #headers and #params private
Extract #escape
Simplify Signature
Extract Query to a class