Refactoring in GameModel.