Coding readability and menu updates