Reporting refactoring