Style cleanup.
Cleanup clang warnings.