better var names and add empty_menu test