More CSV formatting cleanup