PIM-1526 : Make CsvEncoder cleaner