Tidy up the resp and use of CSVs