remove m_range in RangeAggregator and clean up for pull request