clang-format changed again; these changes look better