Clang related clean up, formatting fixes.