diff --git a/Scripts/developer_scripts/create_cgal_test_with_cmake b/Scripts/developer_scripts/create_cgal_test_with_cmake
index 2739d84ee25..02ba927e67f 100755
--- a/Scripts/developer_scripts/create_cgal_test_with_cmake
+++ b/Scripts/developer_scripts/create_cgal_test_with_cmake
@@ -9,7 +9,7 @@
 # coordinator   : Utrecht University
 # =============================================================================
 #
-# This script creates a cgal_test_with_cmake script with entries for all .C and .cpp 
+# This script creates a cgal_test_with_cmake script with entries for all .C and .cpp
 # files in the current test directory.
 
 VERSION=1.1
@@ -62,20 +62,20 @@ cat << EOF
     MAKE_CMD=make
   fi
   NEED_CLEAN=
+
 EOF
-  echo
   header "configure"
-  echo
 cat << EOF
+
 configure()
 {
   echo "Configuring... "
-  
+
   if eval 'cmake "\$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE  \\
                                      -DCGAL_DIR="\$CGAL_DIR" \\
                                      .' ; then
-                                     
-    echo "   succesful configuration" >> \$ERRORFILE
+
+    echo "   successful configuration" >> \$ERRORFILE
   else
     echo "   ERROR:    configuration" >> \$ERRORFILE
   fi
@@ -83,22 +83,22 @@ configure()
 
 EOF
   header "compile_and_run <target>"
-  echo
 cat << EOF
+
 compile_and_run()
 {
   echo "Compiling \$1 ... "
-  SUCCES="y"
-  
+  SUCCESS="y"
+
   if eval '\${MAKE_CMD} VERBOSE=ON -fMakefile \$1' ; then
-    echo "   succesful compilation of \$1" >> \$ERRORFILE
+    echo "   successful compilation of \$1" >> \$ERRORFILE
   else
     echo "   ERROR:    compilation of \$1" >> \$ERRORFILE
-    SUCCES=""
+    SUCCESS=""
   fi
 
   if [ -n "\$DO_RUN" ] ; then
-    if [ -n "\${SUCCES}" ] ; then
+    if [ -n "\${SUCCESS}" ] ; then
       OUTPUTFILE=ProgramOutput.\$1.\$PLATFORM
       rm -f \$OUTPUTFILE
       COMMAND="./\$1"
@@ -112,7 +112,7 @@ compile_and_run()
       echo
       ulimit -t 3600 2> /dev/null
       if eval \$COMMAND > \$OUTPUTFILE 2>&1 ; then
-        echo "   succesful execution   of \$1" >> \$ERRORFILE
+        echo "   successful execution   of \$1" >> \$ERRORFILE
       else
         echo "   ERROR:    execution   of \$1" >> \$ERRORFILE
       fi
@@ -124,15 +124,17 @@ compile_and_run()
 
 EOF
   header "remove the previous error file"
-  echo
-  echo "rm -f \$ERRORFILE"
-  echo "touch \$ERRORFILE"
-  echo
-  header "configure, compile and run the tests"
-  echo
-  echo "configure"
-  echo
 cat << EOF
+
+rm -f \$ERRORFILE
+touch \$ERRORFILE
+
+EOF
+  header "configure, compile and run the tests"
+cat << EOF
+
+configure
+
 if [ \$# -ne 0 ] ; then
   for file in \$* ; do
     compile_and_run \$file
@@ -145,7 +147,7 @@ EOF
       tmp=`basename $file .C`
       tmp=`basename $tmp .cpp`
       cat <<EOF
-if  \${MAKE_CMD} -f Makefile help | grep "$tmp" > /dev/null; then 
+if  \${MAKE_CMD} -f Makefile help | grep "$tmp" > /dev/null; then
   compile_and_run $tmp
   NEED_CLEAN=y
 fi
@@ -156,16 +158,16 @@ cat << EOF
 fi
 
 #
-# The clean target generated by CMake under cygwin 
+# The clean target generated by CMake under cygwin
 # always fails for some reason
 #
-if [ -n "\${NEED_CLEAN}" ]; then 
+if [ -n "\${NEED_CLEAN}" ]; then
   if ! ( uname | grep -q "CYGWIN" ) ; then
     \${MAKE_CMD} -fMakefile clean
   fi
 fi
 EOF
-  
+
 }
 
 if [ -f cgal_test_with_cmake ] ; then