refactor resolving