MainMenu, slight code cleanup