Enhancements to csv_reader
Clean up