basic refactor of main game class