reporting refactoring