Improved CSV formatting