Cleanup, try to separate ReportCreator