cleaned up the main game class