Reports refactoring