Cleaned up CsvReader and CsvWriter