Adjustments on CSV generation and cleanup
Merge pull request #531 from owdqa/feature/scripts_cleanup

Adjustments on CSV generation and cleanup