Improve CSV output