Cleaning up data set handling a bit.