panelMenu: Clean up code a bit