diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fb0c3f1..8115166e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Replace string concatenation with modern template literals
 - Remove redundant 'use strict' directives as modules are automatically in strict mode
 - Refactor assignment-in-expression patterns to improve code clarity and readability
+- Replace comma operators with individual statements for clearer, more readable code
 - Replace Object.prototype.hasOwnProperty() with safer Object.hasOwn() method
 - Enforce strict equality checks (=== and !==) instead of loose equality (== and !=)
 - Replace global isNaN with Number.isNaN for safer type checking
diff --git a/biome.json b/biome.json
index 3e308c21..e47e68f8 100644
--- a/biome.json
+++ b/biome.json
@@ -12,7 +12,7 @@
     "enabled": true,
     "rules": {
       "complexity": {
-        "noCommaOperator": "off",
+        "noCommaOperator": "error",
         "noUselessCatch": "error",
         "useArrowFunction": "error",
         "useOptionalChain": "off",
diff --git a/callback_api.js b/callback_api.js
index c50f41c1..b3b3e94d 100644
--- a/callback_api.js
+++ b/callback_api.js
@@ -6,8 +6,14 @@ const CallbackModel = require('./lib/callback_model').CallbackModel;
 // connect(url, callback)
 // connect(callback)
 function connect(url, options, cb) {
-  if (typeof url === 'function') (cb = url), (url = false), (options = false);
-  else if (typeof options === 'function') (cb = options), (options = false);
+  if (typeof url === 'function') {
+    cb = url;
+    url = false;
+    options = false;
+  } else if (typeof options === 'function') {
+    cb = options;
+    options = false;
+  }
 
   raw_connect(url, options, (err, c) => {
     if (err === null) cb(null, new CallbackModel(c));
diff --git a/test/callback_api.js b/test/callback_api.js
index 6391a39d..a241ce2d 100644
--- a/test/callback_api.js
+++ b/test/callback_api.js
@@ -25,11 +25,17 @@ function ignore() {}
 function twice(done) {
   let first = (err) => {
     if (err === undefined) second = done;
-    else (second = ignore), done(err);
+    else {
+      second = ignore;
+      done(err);
+    }
   };
   let second = (err) => {
     if (err === undefined) first = done;
-    else (first = ignore), done(err);
+    else {
+      first = ignore;
+      done(err);
+    }
   };
   return {
     first: (err) => {
diff --git a/test/connect.js b/test/connect.js
index 9c59a6e9..537549b9 100644
--- a/test/connect.js
+++ b/test/connect.js
@@ -111,7 +111,8 @@ suite('Connect API', () => {
       p = 'guest';
     if (parts.auth) {
       const auth = parts.auth.split(':');
-      (u = auth[0]), (p = auth[1]);
+      u = auth[0];
+      p = auth[1];
     }
     connect(URL, {credentials: require('../lib/credentials').plain(u, p)}, kCallback(succeed(done), fail(done)));
   });
@@ -123,7 +124,8 @@ suite('Connect API', () => {
       p = 'guest';
     if (parts.auth) {
       const auth = parts.auth.split(':');
-      (u = auth[0]), (p = auth[1]);
+      u = auth[0];
+      p = auth[1];
     }
     connect(URL, {credentials: require('../lib/credentials').amqplain(u, p)}, kCallback(succeed(done), fail(done)));
   });