[MenuState] Code Refactoring.