Adjustments on CSV generation and cleanup

Same response