Tidied up some of the CSV processor