Minor formatting updates. WIP.