refactor menu type usage