Now with updated clang-format