Add to rewrite the script to have the function agument propper. Made a few more tweaks to clang-format.