tidy up
decorator for Query