Reorg.
Some key formatting.
More formatting tests.