No functional change -- just added whitespace in places so I could follow

the logic better.  Will be adding some additional tests later today.