Improve CsvToModel and GoesVariable classes, pending testing