cleaning up and combining queries.
Merge pull request #13 from annalee/querygolf

cleaning up and combining queries.