Refactor MenuService