service.resolver: Clean up code
Clean up code