Tweak: cleaned up the main game frame classes