Revert "more clang-format applied"

This reverts commit 6969b4091ef6381e6fa257463f4555633604f587.
fix broken formatting