Started improving formatting.

To be finished.