Refactoring of GameSession