diff --git a/packages/cli/src/cmds/compare-report/Preprocessor.ts b/packages/cli/src/cmds/compare-report/Preprocessor.ts
index 08ee03e0e4..5fd3dd5713 100644
--- a/packages/cli/src/cmds/compare-report/Preprocessor.ts
+++ b/packages/cli/src/cmds/compare-report/Preprocessor.ts
@@ -110,7 +110,7 @@ export function filterFindings(findings: FindingChange[], section: Section | Exp
   return findings.filter(
     (finding) =>
       (!includeDomains || includeDomains.includes(finding.finding.impactDomain || 'Stability')) &&
-      (!excludeDomains || !excludeDomains.includes(finding.finding.impactDomain || 'Stability'))
+      (!excludeDomains?.includes(finding.finding.impactDomain || 'Stability'))
   );
 }
 
diff --git a/packages/cli/src/fingerprint/algorithms.js b/packages/cli/src/fingerprint/algorithms.js
index 8b968d4c2a..83926d88ee 100644
--- a/packages/cli/src/fingerprint/algorithms.js
+++ b/packages/cli/src/fingerprint/algorithms.js
@@ -55,7 +55,7 @@ function buildTree(events) {
   });
 
   const commands = rootEvents.filter(
-    (e) => e.kind === 'http_server_request' || (e.labels && e.labels.includes('command'))
+    (e) => e.kind === 'http_server_request' || (e.labels?.includes('command'))
   );
   if (commands.length > 0) {
     return commands;
diff --git a/packages/cli/src/inspect/filter.js b/packages/cli/src/inspect/filter.js
index 13c448e306..40b1b9ebfe 100644
--- a/packages/cli/src/inspect/filter.js
+++ b/packages/cli/src/inspect/filter.js
@@ -46,7 +46,7 @@ const filter = (rl, context, home) => {
         filter(rl, context, home);
       }
 
-      if (!filterField || !filterField.filterName) {
+      if (!filterField?.filterName) {
         return retry();
       }
 
diff --git a/packages/cli/src/lib/git.ts b/packages/cli/src/lib/git.ts
index e79cdcac1b..b0acb7eb02 100644
--- a/packages/cli/src/lib/git.ts
+++ b/packages/cli/src/lib/git.ts
@@ -41,7 +41,7 @@ class SanitizedUri {
 }
 
 function hasUrl(remote: unknown): remote is { url: string } {
-  return remote && remote['url'];
+  return remote?.['url'];
 }
 
 async function findAndSanitizeRepository(dir: string): Promise<SanitizedUri | void> {
diff --git a/packages/cli/src/lib/serveAndOpen.ts b/packages/cli/src/lib/serveAndOpen.ts
index e577a3e9e0..f7b184d844 100644
--- a/packages/cli/src/lib/serveAndOpen.ts
+++ b/packages/cli/src/lib/serveAndOpen.ts
@@ -66,7 +66,7 @@ export default async function serveAndOpen(
       const pathname = requestUrl.pathname;
       if (pathname === '/') {
         return serveStaticFile(baseDir, file, 'text/html');
-      } else if (pathname && pathname.startsWith('/resource')) {
+      } else if (pathname?.startsWith('/resource')) {
         const pathname = requestUrl.query;
         if (pathname) serveStaticFile(process.cwd(), decodeURIComponent(pathname));
         else send404();
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index b043278548..6d51ec2e7f 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -56,7 +56,7 @@ export async function mtime(filePath: PathLike): Promise<number | undefined> {
   // as temp files).
 
   const fileStat = await statFile(filePath);
-  if (!fileStat || !fileStat.isFile()) {
+  if (!fileStat?.isFile()) {
     return;
   }
   return fileStat.mtimeMs;
@@ -64,7 +64,7 @@ export async function mtime(filePath: PathLike): Promise<number | undefined> {
 
 export async function isFile(filePath: PathLike): Promise<boolean> {
   const fileStat = await statFile(filePath);
-  return !!(fileStat && fileStat.isFile());
+  return !!fileStat?.isFile();
 }
 
 /**
@@ -147,7 +147,7 @@ export async function processNamedFiles(
     // If the directory contains the target fileName, add it to the process queue and return.
     const targetFileName = join(dir, fileName);
     const target = await stats(targetFileName);
-    if (target && target.isFile()) {
+    if (target?.isFile()) {
       matchCount += 1;
       q.push(targetFileName);
       return;
@@ -162,7 +162,7 @@ export async function processNamedFiles(
     }
     for (const childName of children) {
       const child = await stats(join(dir, childName));
-      if (child && child.isDirectory()) {
+      if (child?.isDirectory()) {
         await processDir(join(dir, childName));
       }
     }
@@ -256,8 +256,8 @@ export function prefixLines(str: string, prefix: string): string {
   return str.replace(/^/gm, prefix);
 }
 
-export function formatValue(value: ReturnValueObject) {
-  if (value === null || value === undefined || value.value === null || value.value === undefined) {
+export function formatValue(value?: ReturnValueObject) {
+  if (value?.value === null || value?.value === undefined) {
     return 'Null';
   }