Improve CSV helper