Game refactored