Refactored in the interactive menu, used case statements