continue resolve refactor