More clang cleanups
Merge pull request #3599 from ktf/clang-cond-formats

Clang -- More clang cleanups