Improved CSV output