refactoring reporting