code cleanup - menus