Cleaning up report generation...