wifi-menu: Refactoring as Jouke suggested