some refactoring, mostly clearing up the game initializer