Refactoring to make conversions more reusable
Make CsvFile re-entrant (#150)