More refactoring in reports.