Clean up csv generation