cleaning up how DataSets are handled