include a context for the query and clean up the code