Fix a few code style issues.