Update .clang-format and reformat