menu: cleanup, format code