(Menu) Refactor code