Cleanup of code
Reverted back to data set name = group name