refactored the structure of the report