Simplify?/improve cvs parsing