diff --git a/src/lib/browse/InterventionColorSelector.svelte b/src/lib/browse/InterventionColorSelector.svelte
index 97a354840..b89a08317 100644
--- a/src/lib/browse/InterventionColorSelector.svelte
+++ b/src/lib/browse/InterventionColorSelector.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import { constructMatchExpression } from "../maplibre";
   import { colorInterventionsBySchema, schemaLegend } from "../../schemas";
   import { map } from "../../stores";
   import { Legend } from "../common";
   import { Select } from "../govuk";
+  import { constructMatchExpression } from "../maplibre";
   import { colors } from "./colors";
 
   let colorInterventionsAccordingTo = "interventionType";
diff --git a/src/lib/browse/SchemeCard.svelte b/src/lib/browse/SchemeCard.svelte
index 6ea107ea6..4db70cb37 100644
--- a/src/lib/browse/SchemeCard.svelte
+++ b/src/lib/browse/SchemeCard.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { FeatureCollection } from "geojson";
-  import { bbox } from "../maplibre";
   import { gjScheme, map } from "../../stores";
   import { CollapsibleCard } from "../common";
   import { SecondaryButton } from "../govuk";
+  import { bbox } from "../maplibre";
   import type { Scheme } from "./data";
 
   export let scheme: Scheme;
diff --git a/src/lib/draw/GeometryMode.svelte b/src/lib/draw/GeometryMode.svelte
index 19a4658e8..543ae37a5 100644
--- a/src/lib/draw/GeometryMode.svelte
+++ b/src/lib/draw/GeometryMode.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import type { LineString, Point, Polygon } from "geojson";
   import { MapMouseEvent } from "maplibre-gl";
-  import type { FeatureWithProps } from "../maplibre";
   import { schemaSingularNoun } from "../../schemas";
   import { currentMode, gjScheme, map, mapHover } from "../../stores";
   import type { Feature, FeatureUnion, Schema } from "../../types";
+  import type { FeatureWithProps } from "../maplibre";
   import type { EventHandler } from "./event_handler";
   import type { PointTool } from "./point/point_tool";
   import PointControls from "./point/PointControls.svelte";
diff --git a/src/lib/draw/HoverLayer.svelte b/src/lib/draw/HoverLayer.svelte
index e06b70e83..6a5007450 100644
--- a/src/lib/draw/HoverLayer.svelte
+++ b/src/lib/draw/HoverLayer.svelte
@@ -1,6 +1,14 @@
 <script lang="ts">
   import type { GeoJSONSource } from "maplibre-gl";
   import { circleRadius, colors, lineWidth } from "../../colors";
+  import {
+    formOpen,
+    gjScheme,
+    isAToolInUse,
+    map,
+    mapHover,
+    sidebarHover,
+  } from "../../stores";
   import {
     emptyGeojson,
     isLine,
@@ -10,14 +18,6 @@
     overwriteLineLayer,
     overwriteSource,
   } from "../maplibre";
-  import {
-    formOpen,
-    gjScheme,
-    isAToolInUse,
-    map,
-    mapHover,
-    sidebarHover,
-  } from "../../stores";
 
   // Show clickable objects on the map using the cursor
   $: {
diff --git a/src/lib/draw/InterventionLayer.svelte b/src/lib/draw/InterventionLayer.svelte
index a539dbb43..3100989d4 100644
--- a/src/lib/draw/InterventionLayer.svelte
+++ b/src/lib/draw/InterventionLayer.svelte
@@ -5,6 +5,7 @@
     GeoJSONSource,
   } from "maplibre-gl";
   import { circleRadius, colors, lineWidth } from "../../colors";
+  import { gjScheme, map } from "../../stores";
   import {
     isLine,
     isPoint,
@@ -14,7 +15,6 @@
     overwritePolygonLayer,
     overwriteSource,
   } from "../maplibre";
-  import { gjScheme, map } from "../../stores";
 
   export let colorInterventions: DataDrivenPropertyValueSpecification<string>;
 
diff --git a/src/lib/draw/polygon/PolygonMode.svelte b/src/lib/draw/polygon/PolygonMode.svelte
index 7947cdb58..f7703f602 100644
--- a/src/lib/draw/polygon/PolygonMode.svelte
+++ b/src/lib/draw/polygon/PolygonMode.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { Polygon } from "geojson";
-  import type { FeatureWithProps } from "../../maplibre";
   import { currentMode } from "../../../stores";
   import type { Mode } from "../../../types";
+  import type { FeatureWithProps } from "../../maplibre";
   import { handleUnsavedFeature, setupEventListeners } from "../common";
   import type { EventHandler } from "../event_handler";
   import type { PolygonTool } from "./polygon_tool";
diff --git a/src/lib/draw/snap_polygon/SnapPolygonMode.svelte b/src/lib/draw/snap_polygon/SnapPolygonMode.svelte
index 1ab0f80b9..7127a5708 100644
--- a/src/lib/draw/snap_polygon/SnapPolygonMode.svelte
+++ b/src/lib/draw/snap_polygon/SnapPolygonMode.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { Polygon } from "geojson";
-  import type { FeatureWithProps } from "../../maplibre";
   import { currentMode } from "../../../stores";
   import type { Mode } from "../../../types";
+  import type { FeatureWithProps } from "../../maplibre";
   import { handleUnsavedFeature, setupEventListeners } from "../common";
   import type { EventHandler } from "../event_handler";
   import type { RouteTool } from "../route/route_tool";
diff --git a/src/lib/layers/SpeedLimits.svelte b/src/lib/layers/SpeedLimits.svelte
index 9c2533a4a..877b348eb 100644
--- a/src/lib/layers/SpeedLimits.svelte
+++ b/src/lib/layers/SpeedLimits.svelte
@@ -9,14 +9,14 @@
   } from "maplibre-gl";
   import { onDestroy, onMount } from "svelte";
   import { lineWidth } from "../../colors";
+  import { gjScheme, map, routeInfo } from "../../stores";
+  import type { Feature } from "../../types";
+  import { DiscreteLegend, HelpButton, InteractiveLayer } from "../common";
   import {
     emptyGeojson,
     overwriteLineLayer,
     overwriteSource,
   } from "../maplibre";
-  import { gjScheme, map, routeInfo } from "../../stores";
-  import type { Feature } from "../../types";
-  import { DiscreteLegend, HelpButton, InteractiveLayer } from "../common";
 
   // Show along a route if specified, or show all otherwise
   export let id: number | undefined;