Refactor some of the query methods & add better documentation