Refactore class CSVFile.
Add missing uses.