Game: Refactoring