Data set editing tidy up