DRY refactoring for query methods
Merge pull request #3 from cflannagan/refactoring_query_methods

DRY refactoring for query methods