moved the reporting user and report generation code
just some general cleaning up