Adjustments on CSV generation and cleanup

Sure, next chapter