Further refactoring to Game class