Refactoring Menu, Better Code Indentions