Generalized Csv very slightly; some other whitespace changes