Fixes #25 - Cleaning up report generation