clean code naming & add aggregator machanism