diff --git a/Clava-JS/src-api/clava/cmake/CMaker.ts b/Clava-JS/src-api/clava/cmake/CMaker.ts
index 563d4c505..f7d9b7fca 100644
--- a/Clava-JS/src-api/clava/cmake/CMaker.ts
+++ b/Clava-JS/src-api/clava/cmake/CMaker.ts
@@ -286,33 +286,26 @@ export default class CMaker extends BenchmarkCompilationEngine {
     const builderFolderpath = Io.mkdir(builderFolder).getAbsolutePath();
 
     // Execute CMake
-    let cmakeCmd =
-      'cmake "' + cmakeFile.getParentFile().getAbsolutePath() + '"';
+    let cmakeCmd = ["cmake", `"${cmakeFile.getParentFile().getAbsolutePath()}"`];
     if (cmakeFlags !== undefined) {
-      cmakeCmd += " " + cmakeFlags;
+      cmakeCmd.push(cmakeFlags);
     }
 
     if (this.generator !== undefined) {
-      cmakeCmd += ` -G "${this.generator}"`;
+      cmakeCmd.push(`-G "${this.generator}"`);
     }
 
     if (this.compiler !== undefined) {
-      cmakeCmd += " " + this.compiler.getCommandArgs();
+      cmakeCmd.push(this.compiler.getCommandArgs());
     }
 
-    debug(
-      "Executing CMake, calling '" +
-        cmakeCmd +
-        "' at ' " +
-        builderFolderpath +
-        " '"
-    );
+    debug(() =>`Executing CMake, calling '${cmakeCmd.join(" ")}' at '${builderFolderpath}'`);
     const cmakeOutput = new ProcessExecutor();
 
     cmakeOutput
       .setPrintToConsole(this.printToConsole)
       .setWorkingDir(builderFolderpath)
-      .execute(cmakeCmd);
+      .execute(...cmakeCmd);
 
     const consoleOutput = cmakeOutput.getConsoleOutput();
     if (cmakeOutput.getReturnValue() === 0 && consoleOutput != undefined) {
diff --git a/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js b/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js
index 48c8ac99d..13873fff0 100644
--- a/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js
+++ b/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js
@@ -213,26 +213,22 @@ export default class CMaker extends BenchmarkCompilationEngine {
         Io.writeFile(cmakeFile, this.getCode());
         const builderFolderpath = Io.mkdir(builderFolder).getAbsolutePath();
         // Execute CMake
-        let cmakeCmd = 'cmake "' + cmakeFile.getParentFile().getAbsolutePath() + '"';
+        let cmakeCmd = ["cmake", `"${cmakeFile.getParentFile().getAbsolutePath()}"`];
         if (cmakeFlags !== undefined) {
-            cmakeCmd += " " + cmakeFlags;
+            cmakeCmd.push(cmakeFlags);
         }
         if (this.generator !== undefined) {
-            cmakeCmd += ` -G "${this.generator}"`;
+            cmakeCmd.push(`-G "${this.generator}"`);
         }
         if (this.compiler !== undefined) {
-            cmakeCmd += " " + this.compiler.getCommandArgs();
+            cmakeCmd.push(this.compiler.getCommandArgs());
         }
-        debug("Executing CMake, calling '" +
-            cmakeCmd +
-            "' at ' " +
-            builderFolderpath +
-            " '");
+        debug(() => `Executing CMake, calling '${cmakeCmd.join(" ")}' at '${builderFolderpath}'`);
         const cmakeOutput = new ProcessExecutor();
         cmakeOutput
             .setPrintToConsole(this.printToConsole)
             .setWorkingDir(builderFolderpath)
-            .execute(cmakeCmd);
+            .execute(...cmakeCmd);
         const consoleOutput = cmakeOutput.getConsoleOutput();
         if (cmakeOutput.getReturnValue() === 0 && consoleOutput != undefined) {
             debug("CMake output:");
diff --git a/ClavaWeaver/resources/clava/test/api/CMakerTest.js b/ClavaWeaver/resources/clava/test/api/CMakerTest.js
index 4589d4b13..d2b024c09 100644
--- a/ClavaWeaver/resources/clava/test/api/CMakerTest.js
+++ b/ClavaWeaver/resources/clava/test/api/CMakerTest.js
@@ -3,7 +3,7 @@ laraImport("lara.Platforms");
 laraImport("clava.cmake.CMaker");
 laraImport("clava.Clava");
 
-var cmaker = new CMaker("testapp")
+const cmaker = new CMaker("testapp")
   .setMinimumVersion("3.0.2")
   .addCxxFlags("-O3", "-std=c++11")
   .addLibs("stdc++")
@@ -14,7 +14,7 @@ if (Platforms.isWindows()) {
 }
 
 // Build
-var executable = cmaker.build();
+const executable = cmaker.build();
 
 if (executable !== undefined) {
   println("Created executable: " + Io.removeExtension(executable.getName()));