Update clang-format rules, reformat code