minor refactors of Resolver