Refactored ReportHelper