[REFACTOR] Resolvers tidy up