refactoring on report for further report