Prettier output.  Fix #1.  Fix #2.
Prettier formatting.  Finish implementing #2.