diff --git a/scripts/astyle.sh b/scripts/astyle.sh
index 326bb782982..28b1afe21a6 100755
--- a/scripts/astyle.sh
+++ b/scripts/astyle.sh
@@ -68,6 +68,7 @@ astyleit() {
 	scripts/doxygen_space.pl "$modified"
 	diff "$1" "$modified" >/dev/null || mv "$modified" "$1"
 	rm -f "$modified"
+	rm -f "$modified.sortinc"
 }
 
 for f in "$@"; do
diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh
index 5f81569f1a8..da47fabf118 100755
--- a/scripts/prepare-commit.sh
+++ b/scripts/prepare-commit.sh
@@ -91,10 +91,8 @@ for f in $MODIFIED; do
 
   cp $f $m
   ASTYLEPROGRESS=" [$i/$N]" astyle.sh $f
-  if diff -u $m $f >>$ASTYLEDIFF; then
-    # no difference found
-    rm $m
-  fi
+  diff -u $m $f >>$ASTYLEDIFF
+  rm $m
 done
 
 if [ -s "$ASTYLEDIFF" ]; then
@@ -102,11 +100,10 @@ if [ -s "$ASTYLEDIFF" ]; then
     # review astyle changes
     colordiff <$ASTYLEDIFF | less -r
   else
-    echo "Files changed (see $ASTYLEDIFF)"
+    echo "Files changed"
   fi
-else
-  rm $ASTYLEDIFF
 fi
+rm $ASTYLEDIFF
 
 
 # verify SIP files