Fix some style issues.
Fix some style issues.