Further code cleanup. Small fix to Game class.