Refactored ReportGeneratorService.java