Removed unused imports
Splitting aggregate resolver logic into 2 methods to reduce complexity
Adding missing method description