Fix up some formatting and whitespace.