Refactoring of ActivityReportControl.