Make sure our dshape is the same as our data
Bit of cleanup