diff --git a/tools/winscope/src/common/tree_utils.ts b/tools/winscope/src/common/tree_utils.ts
index e31047d5b..f94dad95a 100644
--- a/tools/winscope/src/common/tree_utils.ts
+++ b/tools/winscope/src/common/tree_utils.ts
@@ -56,9 +56,7 @@ class TreeUtils {
     const filter = (item: TreeNode | undefined | null) => {
       if (item) {
         const regex = new RegExp(filterString, 'i');
-        return (
-          (filterString.length === 0 || regex.test(`${item.name}`))
-        );
+        return filterString.length === 0 || regex.test(`${item.name}`);
       }
       return false;
     };
diff --git a/tools/winscope/src/trace/flickerlib/common.js b/tools/winscope/src/trace/flickerlib/common.js
index 852abe041..05835b8b2 100644
--- a/tools/winscope/src/trace/flickerlib/common.js
+++ b/tools/winscope/src/trace/flickerlib/common.js
@@ -24,7 +24,8 @@ const WindowManagerTraceEntryBuilder =
   require('flicker').android.tools.common.traces.wm.WindowManagerTraceEntryBuilder;
 const Activity = require('flicker').android.tools.common.traces.wm.Activity;
 const Configuration = require('flicker').android.tools.common.traces.wm.Configuration;
-const ConfigurationContainer = require('flicker').android.tools.common.traces.wm.ConfigurationContainer;
+const ConfigurationContainer =
+  require('flicker').android.tools.common.traces.wm.ConfigurationContainer;
 const DisplayArea = require('flicker').android.tools.common.traces.wm.DisplayArea;
 const DisplayContent = require('flicker').android.tools.common.traces.wm.DisplayContent;
 const DisplayCutout = require('flicker').android.tools.common.traces.wm.DisplayCutout;
@@ -42,8 +43,10 @@ const WindowToken = require('flicker').android.tools.common.traces.wm.WindowToke
 
 // SF
 const Layer = require('flicker').android.tools.common.traces.surfaceflinger.Layer;
-const LayerProperties = require('flicker').android.tools.common.traces.surfaceflinger.LayerProperties;
-const LayerTraceEntry = require('flicker').android.tools.common.traces.surfaceflinger.LayerTraceEntry;
+const LayerProperties =
+  require('flicker').android.tools.common.traces.surfaceflinger.LayerProperties;
+const LayerTraceEntry =
+  require('flicker').android.tools.common.traces.surfaceflinger.LayerTraceEntry;
 const LayerTraceEntryBuilder =
   require('flicker').android.tools.common.traces.surfaceflinger.LayerTraceEntryBuilder;
 const LayersTrace = require('flicker').android.tools.common.traces.surfaceflinger.LayersTrace;
diff --git a/tools/winscope/src/trace/flickerlib/windows/DisplayContent.ts b/tools/winscope/src/trace/flickerlib/windows/DisplayContent.ts
index 2513f5d40..812b8673b 100644
--- a/tools/winscope/src/trace/flickerlib/windows/DisplayContent.ts
+++ b/tools/winscope/src/trace/flickerlib/windows/DisplayContent.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { DisplayContent, DisplayCutout, Rotation, Rect, toInsets, toRect} from '../common';
+import {DisplayContent, DisplayCutout, Rect, Rotation, toInsets, toRect} from '../common';
 import {shortenName} from '../mixin';
 import {WindowContainer} from './WindowContainer';
 
diff --git a/tools/winscope/src/trace/flickerlib/windows/WindowManagerState.ts b/tools/winscope/src/trace/flickerlib/windows/WindowManagerState.ts
index a593224b4..d7e6d8c35 100644
--- a/tools/winscope/src/trace/flickerlib/windows/WindowManagerState.ts
+++ b/tools/winscope/src/trace/flickerlib/windows/WindowManagerState.ts
@@ -18,8 +18,8 @@ import {TimeUtils} from 'common/time_utils';
 import {ElapsedTimestamp, RealTimestamp} from 'trace/timestamp';
 import {
   KeyguardControllerState,
-  Rotation,
   RootWindowContainer,
+  Rotation,
   WindowManagerPolicy,
   WindowManagerState,
   WindowManagerTraceEntryBuilder,