Tidy up of DataSet, Columns structures