Code cleanup in Game and GameBuilder