Refactored Game and beautified code