Menu Refactoring and Commenting++