Refactored the report classes.