Cleanup code style issues.