Late night refactor

Renamed methods to be more descriptive and moved game helper methods to
own class