doing so lets me flatten the structure, which simplifies the code
because I can do it all at once and makes it easy to create the
multipiece dataset in the correct parallel invariant way.

also style changes and better comments

Change-Id: I99bad8672c0058842df618426489316567215b62