[Resolver] Micro-refactored some code