Fix unusual formatting and a few long lines.