refactor aggregators