cleaned up the rest of the report as well