Better handling of CSV for Excel