Minor formatting changes
Fix clang compilation