Menu, code cleanup
Menu, code cleanup