More CSV cleaning goodness