Clean up some whitespace and comment formatting.