diff --git a/ci/token-swap.sh b/ci/token-swap.sh
index 62834b4461e..408b2133c15 100755
--- a/ci/token-swap.sh
+++ b/ci/token-swap.sh
@@ -2,20 +2,22 @@
 
 set -e
 
-(
-    cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/.."
 
-    ./do.sh update
-    ./do.sh build token-swap
-    ./do.sh doc token-swap
-    ./do.sh test token-swap
-    cc token-swap/inc/token-swap.h -o token-swap/target/token-swap.gch
-)
+./do.sh update
+./do.sh build token
+./do.sh build token-swap
+./do.sh clippy token-swap
+./do.sh doc token-swap
+./do.sh test token-swap
+cc token-swap/inc/token-swap.h -o token-swap/target/token-swap.gch
 
-(
-    cd "$(dirname "$0")/../token/js"
+cd "token/js"
 
-    npm install
-    npm run cluster:devnet
-    npm run start
-)
+npm install
+
+cd "../../token-swap/js"
+
+npm install
+npm run cluster:devnet
+npm run start
\ No newline at end of file
diff --git a/ci/token.sh b/ci/token.sh
index 1fda62aa3a3..e81a2efcff3 100755
--- a/ci/token.sh
+++ b/ci/token.sh
@@ -2,20 +2,16 @@
 
 set -e
 
-(
-    cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/.."
 
-    ./do.sh update
-    ./do.sh build token
-    ./do.sh doc token
-    ./do.sh test token
-    cc token/inc/token.h -o token/target/token.gch
-)
+./do.sh update
+./do.sh build token
+./do.sh doc token
+./do.sh test token
+cc token/inc/token.h -o token/target/token.gch
 
-(
-    cd "$(dirname "$0")/../token/js"
+cd "$(dirname "$0")/../token/js"
 
-    npm install
-    npm run cluster:devnet
-    npm run start
-)
+npm install
+npm run cluster:devnet
+npm run start
diff --git a/token-swap/js/cli/main.js b/token-swap/js/cli/main.js
index 6bd268fbefc..860d3349b22 100644
--- a/token-swap/js/cli/main.js
+++ b/token-swap/js/cli/main.js
@@ -30,5 +30,6 @@ async function main() {
 main()
   .catch(err => {
     console.error(err);
+    process.exit(-1)
   })
   .then(() => process.exit());
diff --git a/token/js/cli/main.js b/token/js/cli/main.js
index bda02b61778..43ba53e6d10 100644
--- a/token/js/cli/main.js
+++ b/token/js/cli/main.js
@@ -44,5 +44,6 @@ async function main() {
 main()
   .catch(err => {
     console.error(err);
+    process.exit(-1)
   })
   .then(() => process.exit());