Refactoring after removing GameRunner.