More cleanup to data munging and more data groupings