refactored some of the sql query objects to better implement reuse