diff --git a/scripts/format.sh b/scripts/format.sh
index bd5868eb..2ae292ff 100755
--- a/scripts/format.sh
+++ b/scripts/format.sh
@@ -6,10 +6,11 @@ echo -n "Running dos2unix     "
 find . -name "*\.h" -o -name "*\.cpp"|grep -v bundled|xargs -I {} sh -c "dos2unix '{}' 2>/dev/null; echo -n '.'"
 echo
 echo -n "Running clang-format "
-find . -name "*\.h" -o -name "*\.cpp"|grep -v bundled|xargs -I {} sh -c "clang-format -i {}; echo -n '.'"
+find include -name "*\.h" |grep -v bundled|xargs -I {} sh -c "clang-format -i {}; echo -n '.'"
+find src -name "*\.cpp"|xargs -I {} sh -c "clang-format -i {}; echo -n '.'"
 echo
 echo -n "Running cmake-format "
-find . -name "CMakeLists.txt" -o -name "*\.cmake"|grep -v bundled|xargs -I {} sh -c "cmake-format --line-width 120 --tab-size 4 --max-subgroups-hwrap 4 -i {}; echo -n '.'"
+find . -name "CMakeLists.txt" -o -name "*\.cmake"|grep -v bundled|grep -v build|xargs -I {} sh -c "cmake-format --line-width 120 --tab-size 4 --max-subgroups-hwrap 4 -i {}; echo -n '.'"
 echo