Refactoring GameState.Context