tidy Query comment