Improved the CSV output