Lots of formatting improvements.