Clean up some code style issues.