Modification to clang-format style.

Fixes constructor initializer list and function return type style.