Refactored Game to follow team coding conventions