Renamed a for_group to for_reporting_group to better reflect the new distinction
Removed resolved comments