(Menu) Refactors - 80-char limit