Game refactoring