CSVXXXFromatter.hh changes