refactor resolver
more refactoring resolver