Cleaning up reporting