diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
index edd57578..afac8e79 100644
--- a/.github/workflows/pull_requests.yml
+++ b/.github/workflows/pull_requests.yml
@@ -21,8 +21,8 @@ jobs:
         npm install
         npm run setheapsize
 
-    - name: Lint
-      run: npm run style && npx grunt lint && git diff --exit-code
+    - name: Format & Lint
+      run: (npm run style || npm run lint) && git diff --exit-code
 
     - name: Unit Tests
       run: |
diff --git a/package.json b/package.json
index f12cd297..84f4e911 100644
--- a/package.json
+++ b/package.json
@@ -191,7 +191,6 @@
     "testuidev": "npx nightwatch --env=dev",
     "lint": "npx grunt lint",
     "style": "prettier --write .",
-    "check-style": "prettier --check .",
     "postinstall": "npx grunt exec:fixCryptoApiImports && npx grunt exec:fixSnackbarMarkup",
     "newop": "node --experimental-modules --experimental-json-modules src/core/config/scripts/newOperation.mjs",
     "minor": "node --experimental-modules --experimental-json-modules src/core/config/scripts/newMinorVersion.mjs",
diff --git a/src/core/operations/DeriveEVPKey.mjs b/src/core/operations/DeriveEVPKey.mjs
index 2d089968..008c2856 100644
--- a/src/core/operations/DeriveEVPKey.mjs
+++ b/src/core/operations/DeriveEVPKey.mjs
@@ -67,12 +67,15 @@ class DeriveEVPKey extends Operation {
             iterations = args[2],
             hasher = args[3],
             salt = Utils.convertToByteString(args[4].string, args[4].option),
-            key = CryptoJS.EvpKDF(passphrase, salt, {
-                // lgtm [js/insufficient-password-hash]
-                keySize: keySize,
-                hasher: CryptoJS.algo[hasher],
-                iterations: iterations
-            });
+            key = CryptoJS.EvpKDF(
+                passphrase, // lgtm [js/insufficient-password-hash]
+                salt,
+                {
+                    keySize: keySize,
+                    hasher: CryptoJS.algo[hasher],
+                    iterations: iterations
+                }
+            );
 
         return key.toString(CryptoJS.enc.Hex);
     }