cleaning up code
Merge branch 'master' of github.com:jpboneyard/hoops