Small refactor with MenuItem Class