mandu refactor