some refactoring, game type checks