diff --git a/apps/nextjs/src/ai-apps/common/state/create-parts.ts b/apps/nextjs/src/ai-apps/common/state/create-parts.ts
index b53130404..ce6f27dd5 100644
--- a/apps/nextjs/src/ai-apps/common/state/create-parts.ts
+++ b/apps/nextjs/src/ai-apps/common/state/create-parts.ts
@@ -1,10 +1,9 @@
 import type {
   GenerationPart,
   GenerationPartAIGenerated,
-  GenerationPartUserTweaked} from "@oakai/core/src/types";
-import {
-  GenerationPartType
+  GenerationPartUserTweaked,
 } from "@oakai/core/src/types";
+import { GenerationPartType } from "@oakai/core/src/types";
 
 export function createAIGeneratedPart<Value>(
   value: Value,
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/state/reducer.ts b/apps/nextjs/src/ai-apps/quiz-designer/state/reducer.ts
index e412c9772..82ca64f85 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/state/reducer.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/state/reducer.ts
@@ -7,15 +7,10 @@ import {
 import { removeAtIndex, updateAtIndex } from "ai-apps/common/state/helpers";
 import type { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
 
-import type { QuizAppAction} from "./actions";
+import type { QuizAppAction } from "./actions";
 import { QuizAppActions } from "./actions";
-import type {
-  QuizAppState,
-  QuizAppStateQuestion} from "./types";
-import {
-  QuizAppStatus,
-  QuizQuestionType,
-} from "./types";
+import type { QuizAppState, QuizAppStateQuestion } from "./types";
+import { QuizAppStatus, QuizQuestionType } from "./types";
 
 export function quizAppReducer(
   state: QuizAppState,
diff --git a/apps/nextjs/src/app/actions.ts b/apps/nextjs/src/app/actions.ts
index cdfd2d16d..6bd363009 100644
--- a/apps/nextjs/src/app/actions.ts
+++ b/apps/nextjs/src/app/actions.ts
@@ -1,8 +1,8 @@
 "use server";
 
-import type { AilaPersistedChat} from "@oakai/aila/src/protocol/schema";
+import type { AilaPersistedChat } from "@oakai/aila/src/protocol/schema";
 import { chatSchema } from "@oakai/aila/src/protocol/schema";
-import type { Prisma} from "@oakai/db";
+import type { Prisma } from "@oakai/db";
 import { prisma } from "@oakai/db";
 import * as Sentry from "@sentry/nextjs";
 
diff --git a/apps/nextjs/src/app/aila/[id]/share/page.tsx b/apps/nextjs/src/app/aila/[id]/share/page.tsx
index 53982f086..bb9fb86b1 100644
--- a/apps/nextjs/src/app/aila/[id]/share/page.tsx
+++ b/apps/nextjs/src/app/aila/[id]/share/page.tsx
@@ -1,4 +1,4 @@
-import type { User} from "@clerk/nextjs/server";
+import type { User } from "@clerk/nextjs/server";
 import { clerkClient } from "@clerk/nextjs/server";
 import { getSessionModerations } from "@oakai/aila/src/features/moderation/getSessionModerations";
 import { demoUsers } from "@oakai/core";
diff --git a/apps/nextjs/src/app/api/aila-download-all/route.ts b/apps/nextjs/src/app/api/aila-download-all/route.ts
index 9135f5f08..7df412f2e 100644
--- a/apps/nextjs/src/app/api/aila-download-all/route.ts
+++ b/apps/nextjs/src/app/api/aila-download-all/route.ts
@@ -1,5 +1,5 @@
 import { auth } from "@clerk/nextjs/server";
-import type { LessonExportType} from "@oakai/db";
+import type { LessonExportType } from "@oakai/db";
 import { prisma } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
diff --git a/apps/nextjs/src/app/api/aila-download/route.ts b/apps/nextjs/src/app/api/aila-download/route.ts
index e539d4e20..52d4cf5b3 100644
--- a/apps/nextjs/src/app/api/aila-download/route.ts
+++ b/apps/nextjs/src/app/api/aila-download/route.ts
@@ -1,5 +1,5 @@
 import { auth } from "@clerk/nextjs/server";
-import type { LessonExportType} from "@oakai/db";
+import type { LessonExportType } from "@oakai/db";
 import { prisma } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
diff --git a/apps/nextjs/src/app/api/chat/chatHandler.ts b/apps/nextjs/src/app/api/chat/chatHandler.ts
index 0512c56f0..6e5218234 100644
--- a/apps/nextjs/src/app/api/chat/chatHandler.ts
+++ b/apps/nextjs/src/app/api/chat/chatHandler.ts
@@ -13,12 +13,9 @@ import {
 } from "@oakai/aila/src/features/analytics";
 import { AilaRag } from "@oakai/aila/src/features/rag/AilaRag";
 import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
-import type {
-  TracingSpan} from "@oakai/core/src/tracing/serverTracing";
-import {
-  withTelemetry,
-} from "@oakai/core/src/tracing/serverTracing";
-import type { PrismaClientWithAccelerate} from "@oakai/db";
+import type { TracingSpan } from "@oakai/core/src/tracing/serverTracing";
+import { withTelemetry } from "@oakai/core/src/tracing/serverTracing";
+import type { PrismaClientWithAccelerate } from "@oakai/db";
 import { prisma as globalPrisma } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 // #TODO StreamingTextResponse is deprecated. If we choose to adopt the "ai" package
diff --git a/apps/nextjs/src/app/api/chat/route.ts b/apps/nextjs/src/app/api/chat/route.ts
index f92d1b371..992bee59e 100644
--- a/apps/nextjs/src/app/api/chat/route.ts
+++ b/apps/nextjs/src/app/api/chat/route.ts
@@ -3,7 +3,7 @@ import type { NextRequest } from "next/server";
 import { withSentry } from "@/lib/sentry/withSentry";
 
 import { handleChatPostRequest } from "./chatHandler";
-import type { Config} from "./config";
+import type { Config } from "./config";
 import { defaultConfig } from "./config";
 
 async function postHandler(req: NextRequest): Promise<Response> {
diff --git a/apps/nextjs/src/app/api/qd-download/route.ts b/apps/nextjs/src/app/api/qd-download/route.ts
index e00c0d593..d6dbbc838 100644
--- a/apps/nextjs/src/app/api/qd-download/route.ts
+++ b/apps/nextjs/src/app/api/qd-download/route.ts
@@ -1,5 +1,5 @@
 import { auth } from "@clerk/nextjs/server";
-import type { LessonExportType} from "@oakai/db";
+import type { LessonExportType } from "@oakai/db";
 import { prisma } from "@oakai/db";
 import { downloadDriveFile } from "@oakai/exports";
 import * as Sentry from "@sentry/node";
diff --git a/apps/nextjs/src/app/home-page.tsx b/apps/nextjs/src/app/home-page.tsx
index 86b7a43d9..1179832f0 100644
--- a/apps/nextjs/src/app/home-page.tsx
+++ b/apps/nextjs/src/app/home-page.tsx
@@ -2,8 +2,7 @@
 
 import { useUser } from "@clerk/nextjs";
 import MuxPlayer from "@mux/mux-player-react";
-import type {
-  OakColorToken} from "@oaknational/oak-components";
+import type { OakColorToken } from "@oaknational/oak-components";
 import {
   OakBox,
   OakFlex,
diff --git a/apps/nextjs/src/app/quiz-designer/quiz-designer-page.tsx b/apps/nextjs/src/app/quiz-designer/quiz-designer-page.tsx
index 8f9e8fbe8..06b02df09 100644
--- a/apps/nextjs/src/app/quiz-designer/quiz-designer-page.tsx
+++ b/apps/nextjs/src/app/quiz-designer/quiz-designer-page.tsx
@@ -5,7 +5,7 @@ import { memo, useCallback, useEffect, useReducer, useState } from "react";
 import { useUser } from "@clerk/nextjs";
 import { aiLogger } from "@oakai/logger";
 import { quizAppReducer } from "ai-apps/quiz-designer/state/reducer";
-import type { QuizAppState} from "ai-apps/quiz-designer/state/types";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import { useQuizSession } from "hooks/useQuizSession";
 import { useRouter } from "next/navigation";
diff --git a/apps/nextjs/src/app/user/[[...index]]/page.tsx b/apps/nextjs/src/app/user/[[...index]]/page.tsx
index 804f85b9d..340bc036c 100644
--- a/apps/nextjs/src/app/user/[[...index]]/page.tsx
+++ b/apps/nextjs/src/app/user/[[...index]]/page.tsx
@@ -1,4 +1,4 @@
-import { UserProfile } from '@clerk/nextjs'
+import { UserProfile } from "@clerk/nextjs";
 
 export default function Page() {
   return (
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
index be7c020b6..fa0c5c7f6 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
@@ -1,14 +1,7 @@
 "use client";
 
-import type {
-  Dispatch,
-  SetStateAction} from "react";
-import {
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
+import type { Dispatch, SetStateAction } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
 import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { OakBox, OakFlex, OakIcon, OakSpan } from "@oaknational/oak-components";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
index 6d94124b9..184bc6707 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
@@ -1,6 +1,6 @@
 // Inspired by Chatbot-UI and modified to fit the needs of this project
 // @see https://github.com/mckaywrigley/chatbot-ui/blob/main/components/Chat/ChatMessage.tsx
-import type { ReactNode} from "react";
+import type { ReactNode } from "react";
 import { useState } from "react";
 
 import type {
@@ -14,10 +14,9 @@ import type {
   PromptDocument,
   StateDocument,
   TextDocument,
-  UnknownDocument} from "@oakai/aila/src/protocol/jsonPatchProtocol";
-import {
-  parseMessageParts,
+  UnknownDocument,
 } from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import { parseMessageParts } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import { isSafe } from "@oakai/core/src/utils/ailaModeration/helpers";
 import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
 import { aiLogger } from "@oakai/logger";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx b/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
index a2239fb5d..1fe02df05 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
@@ -1,4 +1,4 @@
-import type { FC} from "react";
+import type { FC } from "react";
 import React, { memo } from "react";
 import type { Options } from "react-markdown";
 import ReactMarkdown from "react-markdown";
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
index ccc1923a2..131a0d415 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
@@ -1,8 +1,9 @@
-import * as React from 'react'
-import { Slot } from '@radix-ui/react-slot'
-import { cva, type VariantProps } from 'class-variance-authority'
+import * as React from "react";
 
-import { cn } from '@/lib/utils'
+import { Slot } from "@radix-ui/react-slot";
+import { cva, type VariantProps } from "class-variance-authority";
+
+import { cn } from "@/lib/utils";
 
 const buttonVariants = cva(
   'inline-flex items-center justify-center rounded-md text-sm font-medium shadow ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
index c94fa3495..1633f7d0c 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/codeblock.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import type { FC} from "react";
+import type { FC } from "react";
 import { memo } from "react";
 import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
 import { coldarkDark } from "react-syntax-highlighter/dist/cjs/styles/prism";
diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/JudgementContent.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/JudgementContent.tsx
index 2207e208c..f2c750455 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/JudgementContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/JudgementContent.tsx
@@ -1,4 +1,4 @@
-import type { Dispatch, SetStateAction} from "react";
+import type { Dispatch, SetStateAction } from "react";
 import { useMemo } from "react";
 
 import { Box, Grid, Text } from "@radix-ui/themes";
diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
index 55e215563..b5a039e53 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/KeyStageAndSubjectPicker.tsx
@@ -2,10 +2,9 @@ import { useEffect, useMemo } from "react";
 
 import type {
   KeyStageName,
-  SubjectName} from "@oakai/core/src/data/subjectsAndKeyStages";
-import {
-  subjectsAndKeyStages,
+  SubjectName,
 } from "@oakai/core/src/data/subjectsAndKeyStages";
+import { subjectsAndKeyStages } from "@oakai/core/src/data/subjectsAndKeyStages";
 import { Flex } from "@radix-ui/themes";
 
 import Input from "@/components/Input";
diff --git a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackModal.tsx b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackModal.tsx
index 60e6f6c3c..f0a79d180 100644
--- a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackModal.tsx
+++ b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackModal.tsx
@@ -3,11 +3,8 @@ import { useState } from "react";
 import * as Dialog from "@radix-ui/react-dialog";
 import * as Sentry from "@sentry/react";
 
-import type {
-  ModerationFeedbackFormProps} from "@/components/AppComponents/FeedbackForms/ModerationFeedbackForm";
-import {
-  ModerationFeedbackForm
-} from "@/components/AppComponents/FeedbackForms/ModerationFeedbackForm";
+import type { ModerationFeedbackFormProps } from "@/components/AppComponents/FeedbackForms/ModerationFeedbackForm";
+import { ModerationFeedbackForm } from "@/components/AppComponents/FeedbackForms/ModerationFeedbackForm";
 
 import { dialogOverlay } from "../../DialogControl/dialogStyles";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
index 8bd1b7dc0..22661d048 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/Hero.tsx
@@ -1,14 +1,11 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useCallback } from "react";
 
 import type { KeyStageName, SubjectName } from "@oakai/core";
 import { Box, Flex, Heading, Text } from "@radix-ui/themes";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import type { QuizAppState} from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import Image from "next/image";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
index 2cd5e24a1..23a5ef2bc 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizContent.tsx
@@ -1,9 +1,9 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useRef } from "react";
 
 import { Box, Container } from "@radix-ui/themes";
 import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
-import type { QuizAppState} from "ai-apps/quiz-designer/state/types";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import useShareContent from "hooks/useShareContent";
 import useSuggestedQuestions from "hooks/useSuggestedQuestions";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
index 6ddf968dd..8b920cee7 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizDesignerPageContent.tsx
@@ -1,4 +1,4 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useRef } from "react";
 
 import { Box, Container } from "@radix-ui/themes";
@@ -12,11 +12,8 @@ import RateLimitNotification from "@/components/AppComponents/common/RateLimitNo
 import Layout from "@/components/Layout";
 
 import type { QuizAppAction } from "../../../ai-apps/quiz-designer/state/actions";
-import type {
-  QuizAppState} from "../../../ai-apps/quiz-designer/state/types";
-import {
-  QuizAppStatus,
-} from "../../../ai-apps/quiz-designer/state/types";
+import type { QuizAppState } from "../../../ai-apps/quiz-designer/state/types";
+import { QuizAppStatus } from "../../../ai-apps/quiz-designer/state/types";
 import SuggestedQuestions from "./SuggestedQuestions";
 
 type Props = {
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answer.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answer.tsx
index c8590e93e..0447dd562 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answer.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answer.tsx
@@ -1,14 +1,11 @@
 import { useCallback } from "react";
 
-import type { GenerationPart} from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
 import { GenerationPartType } from "@oakai/core/src/types";
 import browserLogger from "@oakai/logger/browser";
 import { Flex } from "@radix-ui/themes";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 import type {
   QuizAppAnswer,
   QuizAppState,
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
index 391a77eb5..cd739f83d 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
@@ -1,4 +1,4 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useState } from "react";
 
 import { Box, Flex } from "@radix-ui/themes";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/ControllerRow.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/ControllerRow.tsx
index 3ed4778a0..85dacbf45 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/ControllerRow.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/ControllerRow.tsx
@@ -1,12 +1,9 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useState } from "react";
 
 import { Flex, Heading } from "@radix-ui/themes";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 
 import useAnalytics from "@/lib/analytics/useAnalytics";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
index 5cf07543b..9fc978685 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Distractor.tsx
@@ -1,15 +1,12 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useCallback, useState } from "react";
 
-import type { GenerationPart} from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
 import { GenerationPartType } from "@oakai/core/src/types";
 import browserLogger from "@oakai/logger/browser";
 import { Flex } from "@radix-ui/themes";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 import type {
   QuizAppDistractor,
   QuizAppState,
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
index 13318074c..13b0272ef 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
@@ -1,19 +1,15 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useCallback } from "react";
 
 import { Box, Flex } from "@radix-ui/themes";
 import { quizRequestGeneration } from "ai-apps/quiz-designer/quizRequestGeneration";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 import type {
   QuizAppState,
   QuizAppStateQuestion,
 } from "ai-apps/quiz-designer/state/types";
-import type {
-  GenerationWithResponse} from "hooks/useGeneration";
+import type { GenerationWithResponse } from "hooks/useGeneration";
 import {
   UseGenerationStatus,
   isGenerationHookLoading,
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/RegenButtonGroup.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/RegenButtonGroup.tsx
index 0929f8c23..420fede29 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/RegenButtonGroup.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/RegenButtonGroup.tsx
@@ -1,9 +1,6 @@
 import { Flex } from "@radix-ui/themes";
-import type {
-  UseGenerationStatus} from "hooks/useGeneration";
-import {
-  isGenerationHookLoading,
-} from "hooks/useGeneration";
+import type { UseGenerationStatus } from "hooks/useGeneration";
+import { isGenerationHookLoading } from "hooks/useGeneration";
 
 import { trpc } from "@/utils/trpc";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/index.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/index.tsx
index 843ac9413..fbe90ec90 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/index.tsx
@@ -1,11 +1,8 @@
 import type { Dispatch } from "react";
 
 import { Box, Flex, Heading, Text } from "@radix-ui/themes";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 import type {
   QuizAppState,
   QuizAppStateQuestion,
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
index 444b2fda7..f61bfc39e 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
@@ -1,12 +1,9 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useCallback } from "react";
 
 import * as Sentry from "@sentry/nextjs";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 
 import { trpc } from "@/utils/trpc";
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
index c2853edbf..5c907490a 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
@@ -1,12 +1,9 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useState } from "react";
 
 import { Flex, Text } from "@radix-ui/themes";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 import type { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
 
 import { Icon } from "@/components/Icon";
diff --git a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
index bd45bb572..cfe0a4d87 100644
--- a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
@@ -6,11 +6,8 @@ import useAnalytics from "@/lib/analytics/useAnalytics";
 import { trackDownload } from "@/utils/trackDownload";
 import { trpc } from "@/utils/trpc";
 
-import type {
-  ExportsType} from "../../ExportsDialogs/exports.helpers";
-import {
-  getExportsConfig,
-} from "../../ExportsDialogs/exports.helpers";
+import type { ExportsType } from "../../ExportsDialogs/exports.helpers";
+import { getExportsConfig } from "../../ExportsDialogs/exports.helpers";
 import { Icon } from "../../Icon";
 import LoadingWheel from "../../LoadingWheel";
 import LessonIcon from "../../SVGParts/LessonIcon";
diff --git a/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx b/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
index 357224baf..de9fac36b 100644
--- a/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
@@ -20,7 +20,7 @@ import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModerati
 import type { Moderation } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
-import type { Message} from "ai";
+import type { Message } from "ai";
 import { nanoid } from "ai";
 import type { ChatRequestOptions, CreateMessage } from "ai";
 import { useChat } from "ai/react";
@@ -31,11 +31,8 @@ import { useLessonPlanTracking } from "@/lib/analytics/lessonPlanTrackingContext
 import useAnalytics from "@/lib/analytics/useAnalytics";
 import { trpc } from "@/utils/trpc";
 
-import type {
-  AilaStreamingStatus} from "../AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
-import {
-  useAilaStreamingStatus,
-} from "../AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
+import type { AilaStreamingStatus } from "../AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
+import { useAilaStreamingStatus } from "../AppComponents/Chat/Chat/hooks/useAilaStreamingStatus";
 import { findMessageIdFromContent } from "../AppComponents/Chat/Chat/utils";
 import {
   isAccountLocked,
diff --git a/apps/nextjs/src/components/ContextProviders/CookieConsentProvider.tsx b/apps/nextjs/src/components/ContextProviders/CookieConsentProvider.tsx
index 5fb98a703..e4c4f5234 100644
--- a/apps/nextjs/src/components/ContextProviders/CookieConsentProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/CookieConsentProvider.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import type { PropsWithChildren} from "react";
+import type { PropsWithChildren } from "react";
 import { useEffect } from "react";
 
 import {
diff --git a/apps/nextjs/src/components/ContextProviders/FontProvider.tsx b/apps/nextjs/src/components/ContextProviders/FontProvider.tsx
index 6d2b0e666..e8008ba58 100644
--- a/apps/nextjs/src/components/ContextProviders/FontProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/FontProvider.tsx
@@ -1,13 +1,7 @@
 "use client";
 
-import type {
-  Dispatch} from "react";
-import React, {
-  createContext,
-  useContext,
-  useMemo,
-  useState,
-} from "react";
+import type { Dispatch } from "react";
+import React, { createContext, useContext, useMemo, useState } from "react";
 
 interface FontContextProps {
   fontClass: string;
diff --git a/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx b/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
index 733bf91d0..4ff4f790d 100644
--- a/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import type { PropsWithChildren} from "react";
+import type { PropsWithChildren } from "react";
 import { useEffect } from "react";
 
 import { useAuth, useUser } from "@clerk/nextjs";
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts b/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
index de95cf53d..7005f37b1 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportAllLessonAssets.ts
@@ -1,10 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
-import type {
-  LessonDeepPartial} from "@oakai/exports/browser";
-import {
-  exportSlidesFullLessonSchema,
-} from "@oakai/exports/browser";
+import type { LessonDeepPartial } from "@oakai/exports/browser";
+import { exportSlidesFullLessonSchema } from "@oakai/exports/browser";
 import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
index df40b9c7d..c78b0eae4 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
@@ -1,10 +1,7 @@
 import { useEffect, useState } from "react";
 
-import type {
-  ExportableQuizAppState} from "@oakai/exports/src/schema/input.schema";
-import {
-  exportableQuizAppStateSchema,
-} from "@oakai/exports/src/schema/input.schema";
+import type { ExportableQuizAppState } from "@oakai/exports/src/schema/input.schema";
+import { exportableQuizAppStateSchema } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
diff --git a/apps/nextjs/src/components/Footer.tsx b/apps/nextjs/src/components/Footer.tsx
index 25b520b02..3533f3cd7 100644
--- a/apps/nextjs/src/components/Footer.tsx
+++ b/apps/nextjs/src/components/Footer.tsx
@@ -1,8 +1,7 @@
 "use client";
 
 import { useAuth } from "@clerk/nextjs";
-import type {
-  OakIconName} from "@oaknational/oak-components";
+import type { OakIconName } from "@oaknational/oak-components";
 import {
   OakBox,
   OakFlex,
diff --git a/apps/nextjs/src/components/MainNavigation/MainNavigationMenu.tsx b/apps/nextjs/src/components/MainNavigation/MainNavigationMenu.tsx
index 62fec1321..2d657e627 100644
--- a/apps/nextjs/src/components/MainNavigation/MainNavigationMenu.tsx
+++ b/apps/nextjs/src/components/MainNavigation/MainNavigationMenu.tsx
@@ -1,4 +1,4 @@
-import type { Ref} from "react";
+import type { Ref } from "react";
 import { forwardRef } from "react";
 
 import { useAuth } from "@clerk/nextjs";
diff --git a/apps/nextjs/src/components/MainNavigation/index.tsx b/apps/nextjs/src/components/MainNavigation/index.tsx
index 88586ff74..ff342ef85 100644
--- a/apps/nextjs/src/components/MainNavigation/index.tsx
+++ b/apps/nextjs/src/components/MainNavigation/index.tsx
@@ -1,4 +1,4 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { Fragment } from "react";
 
 import { Dialog, Transition } from "@headlessui/react";
diff --git a/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx b/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
index c7a3a3206..4c90a4093 100644
--- a/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
+++ b/apps/nextjs/src/components/SubjectAndKeyStageSelect/index.tsx
@@ -2,10 +2,9 @@ import { useEffect, useMemo } from "react";
 
 import type {
   KeyStageName,
-  SubjectName} from "@oakai/core/src/data/subjectsAndKeyStages";
-import {
-  subjectsAndKeyStages,
+  SubjectName,
 } from "@oakai/core/src/data/subjectsAndKeyStages";
+import { subjectsAndKeyStages } from "@oakai/core/src/data/subjectsAndKeyStages";
 import { Flex } from "@radix-ui/themes";
 
 import Input from "../Input";
diff --git a/apps/nextjs/src/hooks/useGeneration.ts b/apps/nextjs/src/hooks/useGeneration.ts
index 88f8b3815..b316a82fc 100644
--- a/apps/nextjs/src/hooks/useGeneration.ts
+++ b/apps/nextjs/src/hooks/useGeneration.ts
@@ -13,7 +13,7 @@ import type { z } from "zod";
 
 import type { DeepPartial } from "@/utils/types/DeepPartial";
 
-import type { RouterInputs} from "../utils/trpc";
+import type { RouterInputs } from "../utils/trpc";
 import { trpc } from "../utils/trpc";
 import { useDidTransition } from "./useDidTransition";
 
diff --git a/apps/nextjs/src/hooks/useGenerationCallbacks.ts b/apps/nextjs/src/hooks/useGenerationCallbacks.ts
index a3f779f52..fb25cf64d 100644
--- a/apps/nextjs/src/hooks/useGenerationCallbacks.ts
+++ b/apps/nextjs/src/hooks/useGenerationCallbacks.ts
@@ -6,7 +6,8 @@ import type {
   FailedGenerationState,
   GeneratingGenerationState,
   PendingGenerationState,
-  SuccessfulGenerationState} from "hooks/useGeneration";
+  SuccessfulGenerationState,
+} from "hooks/useGeneration";
 import {
   UseGenerationError,
   UseGenerationStatus,
diff --git a/apps/nextjs/src/hooks/useQuizSession.ts b/apps/nextjs/src/hooks/useQuizSession.ts
index 89c500b7d..31bcc8398 100644
--- a/apps/nextjs/src/hooks/useQuizSession.ts
+++ b/apps/nextjs/src/hooks/useQuizSession.ts
@@ -1,16 +1,13 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useEffect, useRef } from "react";
 
 import { useUser } from "@clerk/nextjs";
 import browserLogger from "@oakai/logger/browser";
 import * as Sentry from "@sentry/nextjs";
 import { parseLocalStorageData } from "ai-apps/common/parseLocalStorageData";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import type { QuizAppState} from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import { z } from "zod";
 
diff --git a/apps/nextjs/src/hooks/useRegenerateAnswers.ts b/apps/nextjs/src/hooks/useRegenerateAnswers.ts
index f1cd38af7..35fff7d90 100644
--- a/apps/nextjs/src/hooks/useRegenerateAnswers.ts
+++ b/apps/nextjs/src/hooks/useRegenerateAnswers.ts
@@ -1,12 +1,9 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useCallback } from "react";
 
 import { quizRequestGeneration } from "ai-apps/quiz-designer/quizRequestGeneration";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 import type {
   QuizAppState,
   QuizAppStateQuestion,
diff --git a/apps/nextjs/src/hooks/useRegenerateDistractors.ts b/apps/nextjs/src/hooks/useRegenerateDistractors.ts
index 8bf7cfbd2..d8c7466e5 100644
--- a/apps/nextjs/src/hooks/useRegenerateDistractors.ts
+++ b/apps/nextjs/src/hooks/useRegenerateDistractors.ts
@@ -1,12 +1,9 @@
-import type { Dispatch} from "react";
+import type { Dispatch } from "react";
 import { useCallback } from "react";
 
 import { quizRequestGeneration } from "ai-apps/quiz-designer/quizRequestGeneration";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
 import type {
   QuizAppState,
   QuizAppStateQuestion,
diff --git a/apps/nextjs/src/hooks/useSuggestedQuestions.ts b/apps/nextjs/src/hooks/useSuggestedQuestions.ts
index b9363d00b..4a2c8f192 100644
--- a/apps/nextjs/src/hooks/useSuggestedQuestions.ts
+++ b/apps/nextjs/src/hooks/useSuggestedQuestions.ts
@@ -1,12 +1,9 @@
 import { useCallback, useEffect, useState } from "react";
 
 import { extraQuizPromptInfo } from "ai-apps/quiz-designer/extraQuizPromptInfo";
-import type {
-  QuizAppAction} from "ai-apps/quiz-designer/state/actions";
-import {
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import type { QuizAppState} from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 import { QuizAppStatus } from "ai-apps/quiz-designer/state/types";
 import { z } from "zod";
 
diff --git a/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts b/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
index 3a76234f1..d1a62112e 100644
--- a/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
+++ b/apps/nextjs/src/hooks/useTemporaryLessonPlanWithStreamingEdits.ts
@@ -1,7 +1,6 @@
 import { useEffect, useRef, useMemo } from "react";
 
-import type {
-  PatchDocument} from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import type { PatchDocument } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import {
   applyLessonPlanPatch,
   extractPatches,
diff --git a/apps/nextjs/src/lib/analytics/helpers.ts b/apps/nextjs/src/lib/analytics/helpers.ts
index ba803d40b..000ee732a 100644
--- a/apps/nextjs/src/lib/analytics/helpers.ts
+++ b/apps/nextjs/src/lib/analytics/helpers.ts
@@ -5,10 +5,9 @@ import { isTruthy } from "remeda";
 
 import type {
   ModeratedContentTypeValueType,
-  ProductValueType} from "../avo/Avo";
-import {
-  ModeratedContentType
+  ProductValueType,
 } from "../avo/Avo";
+import { ModeratedContentType } from "../avo/Avo";
 
 /**
  * These are the actions which a user could take which result in a message
diff --git a/apps/nextjs/src/lib/analytics/hubspot/HubspotLoader.tsx b/apps/nextjs/src/lib/analytics/hubspot/HubspotLoader.tsx
index ba022df92..ecd0a440f 100644
--- a/apps/nextjs/src/lib/analytics/hubspot/HubspotLoader.tsx
+++ b/apps/nextjs/src/lib/analytics/hubspot/HubspotLoader.tsx
@@ -1,4 +1,4 @@
-import type { FC} from "react";
+import type { FC } from "react";
 import { useEffect } from "react";
 
 import * as Sentry from "@sentry/nextjs";
diff --git a/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx b/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
index 54798381e..3d2412218 100644
--- a/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
+++ b/apps/nextjs/src/lib/analytics/lessonPlanTrackingContext.tsx
@@ -1,5 +1,4 @@
-import type {
-  FC} from "react";
+import type { FC } from "react";
 import {
   createContext,
   useCallback,
diff --git a/apps/nextjs/src/lib/analytics/trackLessonPlanRefined.ts b/apps/nextjs/src/lib/analytics/trackLessonPlanRefined.ts
index 0d0582ea5..6c08a2c74 100644
--- a/apps/nextjs/src/lib/analytics/trackLessonPlanRefined.ts
+++ b/apps/nextjs/src/lib/analytics/trackLessonPlanRefined.ts
@@ -12,8 +12,7 @@ import type { TrackFns } from "@/components/ContextProviders/AnalyticsProvider";
 
 import type { ComponentTypeValueType } from "../avo/Avo";
 import { ComponentType } from "../avo/Avo";
-import type {
-  UserAction} from "./helpers";
+import type { UserAction } from "./helpers";
 import {
   getLessonTrackingProps,
   getModerationTypes,
diff --git a/apps/nextjs/src/middleware.test.ts b/apps/nextjs/src/middleware.test.ts
index 689b9c372..29b6041c3 100644
--- a/apps/nextjs/src/middleware.test.ts
+++ b/apps/nextjs/src/middleware.test.ts
@@ -1,14 +1,9 @@
-import type { NextFetchEvent} from "next/server";
+import type { NextFetchEvent } from "next/server";
 import { NextRequest, NextResponse } from "next/server";
 
 import { handleError } from "./middleware";
-import type {
-  CspConfig,
-  CspEnvironment} from "./middlewares/csp";
-import {
-  addCspHeaders,
-  buildCspHeaders,
-} from "./middlewares/csp";
+import type { CspConfig, CspEnvironment } from "./middlewares/csp";
+import { addCspHeaders, buildCspHeaders } from "./middlewares/csp";
 
 describe("handleError", () => {
   let mockRequest: NextRequest;
diff --git a/apps/nextjs/src/middleware.ts b/apps/nextjs/src/middleware.ts
index 1c8b7f134..5a4f0aacd 100644
--- a/apps/nextjs/src/middleware.ts
+++ b/apps/nextjs/src/middleware.ts
@@ -1,16 +1,11 @@
 import type { NextMiddlewareResult } from "next/dist/server/web/types";
-import type {
-  NextFetchEvent,
-  NextMiddleware,
-  NextRequest} from "next/server";
-import {
-  NextResponse,
-} from "next/server";
+import type { NextFetchEvent, NextMiddleware, NextRequest } from "next/server";
+import { NextResponse } from "next/server";
 
 import { getRootErrorCause } from "./lib/errors/getRootErrorCause";
 import { sentryCleanup } from "./lib/sentry/sentryCleanup";
 import { authMiddleware } from "./middlewares/auth.middleware";
-import type { CspConfig} from "./middlewares/csp";
+import type { CspConfig } from "./middlewares/csp";
 import { addCspHeaders } from "./middlewares/csp";
 import { logError } from "./middlewares/middlewareErrorLogging";
 
diff --git a/apps/nextjs/src/middlewares/auth.middleware.ts b/apps/nextjs/src/middlewares/auth.middleware.ts
index a7cb252d2..f67bbb0ba 100644
--- a/apps/nextjs/src/middlewares/auth.middleware.ts
+++ b/apps/nextjs/src/middlewares/auth.middleware.ts
@@ -1,11 +1,7 @@
-import type {
-  ClerkMiddlewareAuth} from "@clerk/nextjs/server";
-import {
-  clerkMiddleware,
-  createRouteMatcher,
-} from "@clerk/nextjs/server";
+import type { ClerkMiddlewareAuth } from "@clerk/nextjs/server";
+import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
 import { aiLogger } from "@oakai/logger";
-import type { NextFetchEvent, NextRequest} from "next/server";
+import type { NextFetchEvent, NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 
 import { sentrySetUser } from "@/lib/sentry/sentrySetUser";
diff --git a/apps/nextjs/src/middlewares/csp.ts b/apps/nextjs/src/middlewares/csp.ts
index 9ce63d859..a00611977 100644
--- a/apps/nextjs/src/middlewares/csp.ts
+++ b/apps/nextjs/src/middlewares/csp.ts
@@ -1,4 +1,4 @@
-import type { NextRequest} from "next/server";
+import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 import { v4 as uuidv4 } from "uuid";
 
diff --git a/apps/nextjs/src/utils/trpc.tsx b/apps/nextjs/src/utils/trpc.tsx
index 9292cfffc..d971cd801 100644
--- a/apps/nextjs/src/utils/trpc.tsx
+++ b/apps/nextjs/src/utils/trpc.tsx
@@ -6,7 +6,7 @@ import { type AppRouter } from "@oakai/api/src/router";
 import { type ChatAppRouter } from "@oakai/api/src/router/chat";
 import { transformer } from "@oakai/api/transformer";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import type { TRPCLink} from "@trpc/client";
+import type { TRPCLink } from "@trpc/client";
 import { httpBatchLink, loggerLink } from "@trpc/client";
 import { createTRPCReact } from "@trpc/react-query";
 import type { inferRouterInputs } from "@trpc/server";