Fix a couple of formatting and style issues.