Slight refactoring of CSVReader