Better CSV data parsing