Fixing some formatting
Merge branch 'master' of https://github.com/jtsmith1287/gurpscg
finished naming private methods, added TODOs