Formatting tidy up of the document

This is just simple quick, first pass tidying. Expect much more to
be done...