(Menu) Simplify some code