updates fo clang-format and other cleanup