Cleanup some code in menu_action.c