Refactoring and commenting
Cleaning up menus
More changes to menu, mainly comments