diff --git a/fabfile.py b/fabfile.py
index f2ac16def..9079be090 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,11 +1,12 @@
 import datetime
 import os
-import subprocess
 from shlex import quote
+import subprocess
 
 from invoke import run as local
 from invoke.tasks import task
 
+
 # Process .env file
 if os.path.exists(".env"):
     with open(".env") as f:
@@ -137,15 +138,11 @@ def psql(c, command=None):
 @task
 def delete_docker_database(c, local_database_name=LOCAL_DATABASE_NAME):
     dexec(
-        "dropdb --if-exists --host db --username={project_name} {database_name}".format(
-            project_name=PROJECT_NAME, database_name=LOCAL_DATABASE_NAME
-        ),
+        f"dropdb --if-exists --host db --username={PROJECT_NAME} {LOCAL_DATABASE_NAME}",
         "db",
     )
     dexec(
-        "createdb --host db --username={project_name} {database_name}".format(
-            project_name=PROJECT_NAME, database_name=LOCAL_DATABASE_NAME
-        ),
+        f"createdb --host db --username={PROJECT_NAME} {LOCAL_DATABASE_NAME}",
         "db",
     )
     psql(c, "CREATE SCHEMA heroku_ext;")
@@ -160,12 +157,8 @@ def import_data(c, database_filename):
     delete_docker_database(c)
     # Import the database file to the db container
     dexec(
-        "pg_restore --clean --no-acl --if-exists --no-owner --host db \
-            --username={project_name} -d {database_name} {database_filename}".format(
-            project_name=PROJECT_NAME,
-            database_name=LOCAL_DATABASE_NAME,
-            database_filename=database_filename,
-        ),
+        f"pg_restore --clean --no-acl --if-exists --no-owner --host db \
+            --username={PROJECT_NAME} -d {LOCAL_DATABASE_NAME} {database_filename}",
         service="db",
     )
     print(
@@ -275,12 +268,8 @@ def delete_local_database(c, local_database_name=LOCAL_DATABASE_NAME):
 
 def aws(c, command, aws_access_key_id, aws_secret_access_key):
     return local(
-        "AWS_ACCESS_KEY_ID={access_key_id} AWS_SECRET_ACCESS_KEY={secret_key} "
-        "aws {command}".format(
-            access_key_id=aws_access_key_id,
-            secret_key=aws_secret_access_key,
-            command=command,
-        )
+        f"AWS_ACCESS_KEY_ID={aws_access_key_id} AWS_SECRET_ACCESS_KEY={aws_secret_access_key} "
+        f"aws {command}"
     )
 
 
@@ -291,10 +280,7 @@ def pull_media_from_s3(
     aws_storage_bucket_name,
     local_media_dir=LOCAL_MEDIA_DIR,
 ):
-    aws_cmd = "s3 sync --delete s3://{bucket_name} {local_media}".format(
-        bucket_name=aws_storage_bucket_name,
-        local_media=local_media_dir,
-    )
+    aws_cmd = f"s3 sync --delete s3://{aws_storage_bucket_name} {local_media_dir}"
     aws(c, aws_cmd, aws_access_key_id, aws_secret_access_key)
 
 
@@ -318,11 +304,7 @@ def pull_images_from_s3(
     aws_storage_bucket_name,
     local_images_dir=LOCAL_IMAGES_DIR,
 ):
-    aws_cmd = (
-        "s3 sync --delete s3://{bucket_name}/original_images {local_media}".format(
-            bucket_name=aws_storage_bucket_name, local_media=local_images_dir
-        )
-    )
+    aws_cmd = f"s3 sync --delete s3://{aws_storage_bucket_name}/original_images {local_images_dir}"
     aws(c, aws_cmd, aws_access_key_id, aws_secret_access_key)
     # The above command just syncs the original images, so we need to drop the wagtailimages_renditions
     # table so that the renditions will be re-created when requested on the local build.
@@ -351,18 +333,13 @@ def pull_database_from_heroku(c, app_instance, anonymise=False):
     datestamp = datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
 
     local(
-        "heroku pg:backups:download --output={dump_folder}/{datestamp}.dump --app {app}".format(
-            app=app_instance, dump_folder=LOCAL_DUMP_DIR, datestamp=datestamp
-        ),
+        f"heroku pg:backups:download --output={LOCAL_DUMP_DIR}/{datestamp}.dump --app {app_instance}",
     )
 
     import_data(c, f"/app/{LOCAL_DUMP_DIR}/{datestamp}.dump")
 
     local(
-        "rm {dump_folder}/{datestamp}.dump".format(
-            dump_folder=LOCAL_DUMP_DIR,
-            datestamp=datestamp,
-        ),
+        f"rm {LOCAL_DUMP_DIR}/{datestamp}.dump",
     )
 
     if anonymise:
@@ -394,13 +371,9 @@ def make_bold(msg):
 def dellar_snapshot(c, filename):
     """Snapshot the database, files will be stored in the db container"""
     dexec(
-        "pg_dump -d {database_name} -U {database_username} > {filename}.psql".format(
-            database_name=LOCAL_DATABASE_NAME,
-            database_username=LOCAL_DATABASE_USERNAME,
-            filename=filename,
-        ),
+        f"pg_dump -d {LOCAL_DATABASE_NAME} -U {LOCAL_DATABASE_USERNAME} > {filename}.psql",
         service="db",
-    ),
+    )
     print("Database snapshot created")
 
 
@@ -409,14 +382,12 @@ def dellar_restore(c, filename):
     """Restore the database from a snapshot in the db container"""
     delete_docker_database(c)
 
-    dexec(
-        "psql -U {database_username} -d {database_name} < {filename}.psql".format(
-            database_name=LOCAL_DATABASE_NAME,
-            database_username=LOCAL_DATABASE_USERNAME,
-            filename=filename,
+    (
+        dexec(
+            f"psql -U {LOCAL_DATABASE_USERNAME} -d {LOCAL_DATABASE_NAME} < {filename}.psql",
+            service="db",
         ),
-        service="db",
-    ),
+    )
     print("Database restored.")
 
 
@@ -426,10 +397,10 @@ def dellar_list(c):
     print("Database snapshots:")
     dexec(
         """for f in *.psql; do
-            printf ' - %s\n' "${f%.psql}"
-        done""",
+        printf ' - %s\n' "${f%.psql}"
+    done""",
         service="db",
-    ),
+    )
     print("Restore with `dellar-restore <snapshot>`")
 
 
@@ -439,7 +410,7 @@ def dellar_remove(c, filename):
     dexec(
         f"rm {filename}.psql",
         service="db",
-    ),
+    )
     print(f"Snapshot {filename} removed")
 
 
diff --git a/gunicorn-conf.py b/gunicorn-conf.py
index 377ae809d..6170b6dce 100644
--- a/gunicorn-conf.py
+++ b/gunicorn-conf.py
@@ -1,4 +1,5 @@
 # Replace gunicorn's 'Server' HTTP header to avoid leaking info to attackers
 import gunicorn
 
+
 gunicorn.SERVER_SOFTWARE = ""
diff --git a/manage.py b/manage.py
index b662475c9..3ffdfb721 100755
--- a/manage.py
+++ b/manage.py
@@ -2,6 +2,7 @@
 import os
 import sys
 
+
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tbx.settings.production")
 
diff --git a/tbx/blog/factories.py b/tbx/blog/factories.py
index 70f77cc1f..ce8abb259 100644
--- a/tbx/blog/factories.py
+++ b/tbx/blog/factories.py
@@ -1,5 +1,6 @@
 import factory
 import wagtail_factories
+
 from tbx.blog.models import BlogIndexPage, BlogPage
 from tbx.core.factories import StoryBlockFactory
 
diff --git a/tbx/blog/feeds.py b/tbx/blog/feeds.py
index 9006a5ef6..818dc7fc2 100644
--- a/tbx/blog/feeds.py
+++ b/tbx/blog/feeds.py
@@ -6,6 +6,7 @@
 
 from .models import BlogPage
 
+
 # Main blog feed
 
 
diff --git a/tbx/blog/migrations/0001_initial.py b/tbx/blog/migrations/0001_initial.py
index 5f2d17e13..feb6f6fdf 100644
--- a/tbx/blog/migrations/0001_initial.py
+++ b/tbx/blog/migrations/0001_initial.py
@@ -2,18 +2,20 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
-import tbx.core.blocks
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
diff --git a/tbx/blog/migrations/0002_remove_blogindexpage_call_to_action_and_more.py b/tbx/blog/migrations/0002_remove_blogindexpage_call_to_action_and_more.py
index 22b8f39d9..41d5007c9 100644
--- a/tbx/blog/migrations/0002_remove_blogindexpage_call_to_action_and_more.py
+++ b/tbx/blog/migrations/0002_remove_blogindexpage_call_to_action_and_more.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.9 on 2024-01-15 10:16
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("blog", "0001_initial"),
     ]
diff --git a/tbx/blog/migrations/0003_add_new_image_block_to_body_streamfield.py b/tbx/blog/migrations/0003_add_new_image_block_to_body_streamfield.py
index a4d7a8b46..5fd5d3273 100644
--- a/tbx/blog/migrations/0003_add_new_image_block_to_body_streamfield.py
+++ b/tbx/blog/migrations/0003_add_new_image_block_to_body_streamfield.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:14
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0002_remove_blogindexpage_call_to_action_and_more"),
     ]
diff --git a/tbx/blog/migrations/0003_alter_blogpage_body.py b/tbx/blog/migrations/0003_alter_blogpage_body.py
index 796b864b8..36121db5a 100644
--- a/tbx/blog/migrations/0003_alter_blogpage_body.py
+++ b/tbx/blog/migrations/0003_alter_blogpage_body.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.9 on 2024-01-15 12:25
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("blog", "0002_remove_blogindexpage_call_to_action_and_more"),
     ]
diff --git a/tbx/blog/migrations/0004_alter_blogpage_body.py b/tbx/blog/migrations/0004_alter_blogpage_body.py
index 30887545a..5fb083337 100644
--- a/tbx/blog/migrations/0004_alter_blogpage_body.py
+++ b/tbx/blog/migrations/0004_alter_blogpage_body.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.9 on 2024-01-16 13:44
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("blog", "0003_alter_blogpage_body"),
     ]
diff --git a/tbx/blog/migrations/0004_data_migration_aligned_and_wide_images.py b/tbx/blog/migrations/0004_data_migration_aligned_and_wide_images.py
index b5d25336f..2a0291af4 100644
--- a/tbx/blog/migrations/0004_data_migration_aligned_and_wide_images.py
+++ b/tbx/blog/migrations/0004_data_migration_aligned_and_wide_images.py
@@ -1,6 +1,7 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:15
 
 from django.db import migrations
+
 from wagtail.blocks.migrations.migrate_operation import MigrateStreamData
 from wagtail.blocks.migrations.operations import RenameStreamChildrenOperation
 
diff --git a/tbx/blog/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py b/tbx/blog/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
index 99eb1cb42..a81a2760f 100644
--- a/tbx/blog/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
+++ b/tbx/blog/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:53
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0004_data_migration_aligned_and_wide_images"),
     ]
diff --git a/tbx/blog/migrations/0006_merge_20240117_1530.py b/tbx/blog/migrations/0006_merge_20240117_1530.py
index a69c4290c..aee6c4aba 100644
--- a/tbx/blog/migrations/0006_merge_20240117_1530.py
+++ b/tbx/blog/migrations/0006_merge_20240117_1530.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0004_alter_blogpage_body"),
         ("blog", "0005_remove_aligned_and_wide_image_blocks_from_body_streamfield"),
diff --git a/tbx/blog/migrations/0007_alter_blogpage_body.py b/tbx/blog/migrations/0007_alter_blogpage_body.py
index cb0024a88..bb60cfc64 100644
--- a/tbx/blog/migrations/0007_alter_blogpage_body.py
+++ b/tbx/blog/migrations/0007_alter_blogpage_body.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-18 13:49
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0006_merge_20240117_1530"),
     ]
diff --git a/tbx/blog/migrations/0008_alter_blogpage_body.py b/tbx/blog/migrations/0008_alter_blogpage_body.py
index a3965f54d..612a79463 100644
--- a/tbx/blog/migrations/0008_alter_blogpage_body.py
+++ b/tbx/blog/migrations/0008_alter_blogpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-18 14:11
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0007_alter_blogpage_body"),
     ]
diff --git a/tbx/blog/migrations/0009_delete_blogpagerelatedlink.py b/tbx/blog/migrations/0009_delete_blogpagerelatedlink.py
index c66c010f6..880b88457 100644
--- a/tbx/blog/migrations/0009_delete_blogpagerelatedlink.py
+++ b/tbx/blog/migrations/0009_delete_blogpagerelatedlink.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0008_alter_blogpage_body"),
     ]
diff --git a/tbx/blog/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py b/tbx/blog/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py
index 70626fd1d..7bc385261 100644
--- a/tbx/blog/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py
+++ b/tbx/blog/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-19 13:09
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0009_delete_blogpagerelatedlink"),
     ]
diff --git a/tbx/blog/migrations/0011_remove_blogpagetagselect_page_and_more.py b/tbx/blog/migrations/0011_remove_blogpagetagselect_page_and_more.py
index eac900a1d..5ef7e2d27 100644
--- a/tbx/blog/migrations/0011_remove_blogpagetagselect_page_and_more.py
+++ b/tbx/blog/migrations/0011_remove_blogpagetagselect_page_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0010_add_help_text_to_alt_text_field_in_image_block"),
     ]
diff --git a/tbx/blog/migrations/0012_alter_blogpage_body.py b/tbx/blog/migrations/0012_alter_blogpage_body.py
index 2bde8ed8e..291f8f350 100644
--- a/tbx/blog/migrations/0012_alter_blogpage_body.py
+++ b/tbx/blog/migrations/0012_alter_blogpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-24 10:12
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0011_remove_blogpagetagselect_page_and_more"),
     ]
diff --git a/tbx/blog/migrations/0012_alter_blogpageauthor_page.py b/tbx/blog/migrations/0012_alter_blogpageauthor_page.py
index 2d3b4241e..24dad3ce2 100644
--- a/tbx/blog/migrations/0012_alter_blogpageauthor_page.py
+++ b/tbx/blog/migrations/0012_alter_blogpageauthor_page.py
@@ -2,11 +2,11 @@
 
 from django.db import migrations
 import django.db.models.deletion
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0011_remove_blogpagetagselect_page_and_more"),
     ]
diff --git a/tbx/blog/migrations/0014_delete_blogpageauthor.py b/tbx/blog/migrations/0014_delete_blogpageauthor.py
index d266f5736..25698c057 100644
--- a/tbx/blog/migrations/0014_delete_blogpageauthor.py
+++ b/tbx/blog/migrations/0014_delete_blogpageauthor.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0013_data_migration_page_authors"),
     ]
diff --git a/tbx/blog/migrations/0015_merge_20240126_0816.py b/tbx/blog/migrations/0015_merge_20240126_0816.py
index 2c288b74f..c2b188e93 100644
--- a/tbx/blog/migrations/0015_merge_20240126_0816.py
+++ b/tbx/blog/migrations/0015_merge_20240126_0816.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0012_alter_blogpage_body"),
         ("blog", "0014_delete_blogpageauthor"),
diff --git a/tbx/blog/migrations/0016_alter_blogpage_body.py b/tbx/blog/migrations/0016_alter_blogpage_body.py
index 26ac054f3..fbe91dc17 100644
--- a/tbx/blog/migrations/0016_alter_blogpage_body.py
+++ b/tbx/blog/migrations/0016_alter_blogpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-26 10:39
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0015_merge_20240126_0816"),
     ]
diff --git a/tbx/blog/migrations/0017_blogindexpage_theme_blogpage_theme.py b/tbx/blog/migrations/0017_blogindexpage_theme_blogpage_theme.py
index 9c0c5ef6d..2ca0e86e1 100644
--- a/tbx/blog/migrations/0017_blogindexpage_theme_blogpage_theme.py
+++ b/tbx/blog/migrations/0017_blogindexpage_theme_blogpage_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0016_alter_blogpage_body"),
     ]
diff --git a/tbx/blog/migrations/0018_blogpage_related_sectors.py b/tbx/blog/migrations/0018_blogpage_related_sectors.py
index bb4c58fe9..251ca6931 100644
--- a/tbx/blog/migrations/0018_blogpage_related_sectors.py
+++ b/tbx/blog/migrations/0018_blogpage_related_sectors.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-02-06 10:33
 
 from django.db import migrations
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"),
         ("blog", "0017_blogindexpage_theme_blogpage_theme"),
diff --git a/tbx/blog/migrations/0019_add_contact_mixin_to_all_page_models.py b/tbx/blog/migrations/0019_add_contact_mixin_to_all_page_models.py
index 8278fe334..91c033d6a 100644
--- a/tbx/blog/migrations/0019_add_contact_mixin_to_all_page_models.py
+++ b/tbx/blog/migrations/0019_add_contact_mixin_to_all_page_models.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0006_add_contact_mixin_to_all_page_models"),
         ("blog", "0018_blogpage_related_sectors"),
diff --git a/tbx/blog/migrations/0020_alter_blogpage_related_sectors.py b/tbx/blog/migrations/0020_alter_blogpage_related_sectors.py
index aecb2440b..a6e04de56 100644
--- a/tbx/blog/migrations/0020_alter_blogpage_related_sectors.py
+++ b/tbx/blog/migrations/0020_alter_blogpage_related_sectors.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-02-19 14:46
 
 from django.db import migrations
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"),
         ("blog", "0019_add_contact_mixin_to_all_page_models"),
diff --git a/tbx/blog/migrations/0021_alter_blogpage_body.py b/tbx/blog/migrations/0021_alter_blogpage_body.py
index 996e44a86..5b64a4a30 100644
--- a/tbx/blog/migrations/0021_alter_blogpage_body.py
+++ b/tbx/blog/migrations/0021_alter_blogpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-26 09:50
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0020_alter_blogpage_related_sectors"),
     ]
diff --git a/tbx/blog/migrations/0022_add_wide_image_block.py b/tbx/blog/migrations/0022_add_wide_image_block.py
index b6917ea38..0d6792b43 100644
--- a/tbx/blog/migrations/0022_add_wide_image_block.py
+++ b/tbx/blog/migrations/0022_add_wide_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-27 14:14
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0021_alter_blogpage_body"),
     ]
diff --git a/tbx/blog/migrations/0023_add_wide_image_block.py b/tbx/blog/migrations/0023_add_wide_image_block.py
index f32a9785f..a1ffa8c5f 100644
--- a/tbx/blog/migrations/0023_add_wide_image_block.py
+++ b/tbx/blog/migrations/0023_add_wide_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-28 08:44
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0022_add_wide_image_block"),
     ]
diff --git a/tbx/blog/migrations/0024_use_custom_streamfield.py b/tbx/blog/migrations/0024_use_custom_streamfield.py
index 77472d132..7136e47a8 100644
--- a/tbx/blog/migrations/0024_use_custom_streamfield.py
+++ b/tbx/blog/migrations/0024_use_custom_streamfield.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-11 19:43
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0023_add_wide_image_block"),
     ]
diff --git a/tbx/blog/migrations/0025_add_navigation_title_override.py b/tbx/blog/migrations/0025_add_navigation_title_override.py
index 54eacaa78..976ef173b 100644
--- a/tbx/blog/migrations/0025_add_navigation_title_override.py
+++ b/tbx/blog/migrations/0025_add_navigation_title_override.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0024_use_custom_streamfield"),
     ]
diff --git a/tbx/blog/migrations/0026_add_earth_colour_theme.py b/tbx/blog/migrations/0026_add_earth_colour_theme.py
index 9b6fd0105..308e9857d 100644
--- a/tbx/blog/migrations/0026_add_earth_colour_theme.py
+++ b/tbx/blog/migrations/0026_add_earth_colour_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("blog", "0025_add_navigation_title_override"),
     ]
diff --git a/tbx/blog/models.py b/tbx/blog/models.py
index 325a1e228..f75dda0bc 100644
--- a/tbx/blog/models.py
+++ b/tbx/blog/models.py
@@ -1,6 +1,6 @@
+from itertools import chain
 import math
 import string
-from itertools import chain
 
 from django import forms
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
@@ -10,8 +10,14 @@
 from django.utils.functional import cached_property
 from django.utils.http import urlencode
 
-from bs4 import BeautifulSoup
 from modelcluster.fields import ParentalManyToManyField
+from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
+from wagtail.models import Page
+from wagtail.search import index
+from wagtail.signals import page_published
+
+from bs4 import BeautifulSoup
+
 from tbx.core.blocks import StoryBlock
 from tbx.core.utils.fields import StreamField
 from tbx.core.utils.models import (
@@ -22,10 +28,6 @@
 from tbx.images.models import CustomImage
 from tbx.people.models import ContactMixin
 from tbx.taxonomy.models import Sector, Service
-from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
-from wagtail.models import Page
-from wagtail.search import index
-from wagtail.signals import page_published
 
 
 class BlogIndexPage(
diff --git a/tbx/blog/tests/test_models.py b/tbx/blog/tests/test_models.py
index 569338039..4b73e8202 100644
--- a/tbx/blog/tests/test_models.py
+++ b/tbx/blog/tests/test_models.py
@@ -1,12 +1,15 @@
 from django.core.paginator import Page as PaginatorPage
 
+from wagtail.coreutils import get_dummy_request
+from wagtail.models import PageViewRestriction
+from wagtail.test.utils import WagtailPageTestCase
+
 from faker import Faker
+
 from tbx.blog.factories import BlogIndexPageFactory, BlogPageFactory
 from tbx.blog.models import BlogPage
 from tbx.taxonomy.factories import SectorFactory, ServiceFactory
-from wagtail.coreutils import get_dummy_request
-from wagtail.models import PageViewRestriction
-from wagtail.test.utils import WagtailPageTestCase
+
 
 fake = Faker(["en_GB"])
 
@@ -25,14 +28,12 @@ def setUpTestData(cls):
         PageViewRestriction.objects.create(
             page=cls.private_blog_post,
             restriction_type="password",
-            password="password123",
+            password="password123",  # noqa: S106
         )
 
     def test_get_context(self):
         context = self.blog_index.get_context(get_dummy_request())
         blog_posts = context["blog_posts"]
-        print("blog_posts")
-        print(blog_posts)
         self.assertIsInstance(blog_posts, PaginatorPage)
         self.assertEqual(blog_posts.object_list.first(), self.blog_post)
 
diff --git a/tbx/core/blocks.py b/tbx/core/blocks.py
index 9c013c2de..3cdb0c4aa 100644
--- a/tbx/core/blocks.py
+++ b/tbx/core/blocks.py
@@ -1,6 +1,6 @@
-import logging
 from collections import defaultdict
 from datetime import datetime
+import logging
 
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -9,7 +9,6 @@
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
 
-from tbx.images.models import CustomImage
 from wagtail import blocks
 from wagtail.blocks.struct_block import StructBlockValidationError
 from wagtail.contrib.typed_table_block.blocks import (
@@ -22,9 +21,13 @@
 from wagtail.images.blocks import ImageChooserBlock
 from wagtail.models import Page
 from wagtail.snippets.blocks import SnippetChooserBlock
+
 from wagtailmarkdown.blocks import MarkdownBlock
 from wagtailmedia.blocks import VideoChooserBlock
 
+from tbx.images.models import CustomImage
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -101,8 +104,6 @@ class ImageFormatChoiceBlock(blocks.FieldBlock):
     See https://github.com/wagtail/wagtail/issues/3710 for more details.
     """
 
-    pass
-
 
 class AltTextStructValue(blocks.StructValue):
     def image_alt_text(self):
@@ -373,22 +374,23 @@ def featured_case_study_logo(self):
         """
         if logo := self.get("logo"):
             return logo
-        elif page := self.get("link"):
-            if page.content_type.model_class().__name__ == "WorkPage":
-                return page.specific.logo
+        elif (
+            page := self.get("link")
+        ) and page.content_type.model_class().__name__ == "WorkPage":
+            return page.specific.logo
         return None
 
 
 class NumericResultBlock(blocks.StructBlock):
     label = blocks.CharBlock(
         max_length=255,
-        help_text=mark_safe(
+        help_text=mark_safe(  # noqa: S308
             "Short text to describe the change e.g. <strong>Raised over</strong>"
         ),
     )
     headline_number = blocks.CharBlock(
         max_length=255,
-        help_text=mark_safe("A numerical value e.g. <strong>£600k</strong>"),
+        help_text=mark_safe("A numerical value e.g. <strong>£600k</strong>"),  # noqa: S308
     )
 
 
@@ -629,7 +631,7 @@ def clean(self, value):
         result = super().clean(value)
         errors = {}
 
-        for i in range(0, len(result)):
+        for i in range(len(result)):
             button_values = {
                 "button_link": result[i]["button_link"],
                 "button_text": result[i]["button_text"],
@@ -796,16 +798,16 @@ class Meta:
 class NumericStatisticsBlock(blocks.StructBlock):
     headline_number = blocks.CharBlock(
         max_length=255,
-        help_text=mark_safe("A numerical value e.g. <strong>30%</strong>"),
+        help_text=mark_safe("A numerical value e.g. <strong>30%</strong>"),  # noqa: S308
     )
     description = blocks.TextBlock(
-        help_text=mark_safe(
+        help_text=mark_safe(  # noqa: S308
             "Text to describe the change e.g. <strong>Reduction in accessibility errors</strong>"
         )
     )
     further_details = blocks.TextBlock(
         required=False,
-        help_text=mark_safe(
+        help_text=mark_safe(  # noqa: S308
             "Text to give more information, e.g. <strong>Over 80% of pages</strong>"
         ),
     )
@@ -817,13 +819,13 @@ class Meta:
 class TextualStatisticsBlock(blocks.StructBlock):
     headline_text = blocks.CharBlock(
         max_length=255,
-        help_text=mark_safe(
+        help_text=mark_safe(  # noqa: S308
             "Describe a general improvement, e.g. <strong>Reduction in accessibility issues</strong>"
         ),
     )
     further_details = blocks.TextBlock(
         required=False,
-        help_text=mark_safe(
+        help_text=mark_safe(  # noqa: S308
             "Text to give more information, e.g. <strong>Over 80% of pages</strong>"
         ),
     )
diff --git a/tbx/core/context_processors.py b/tbx/core/context_processors.py
index b0c37514f..e8966730a 100644
--- a/tbx/core/context_processors.py
+++ b/tbx/core/context_processors.py
@@ -6,7 +6,6 @@
 
 
 def global_vars(request):
-
     # Read the mode cookie to determine the user's saved preference for light or dark mode, if it exists
     # Ensure it is one of the allowed values
     mode = request.COOKIES.get("torchbox-mode", "dark")
diff --git a/tbx/core/errors.py b/tbx/core/errors.py
index 5a5a6cebe..d2cd5687a 100644
--- a/tbx/core/errors.py
+++ b/tbx/core/errors.py
@@ -1,4 +1,2 @@
 class UnauthorizedHTTPError(Exception):
     """Raised when the user is not authorized to access a resource and the request accepts HTML."""
-
-    pass
diff --git a/tbx/core/factories.py b/tbx/core/factories.py
index ef7cf28b6..41da713c2 100644
--- a/tbx/core/factories.py
+++ b/tbx/core/factories.py
@@ -1,8 +1,10 @@
+from wagtail.blocks import RichTextBlock
+
 import factory
 import wagtail_factories
+
 from tbx.core.blocks import StoryBlock
 from tbx.core.models import HomePage, StandardPage
-from wagtail.blocks import RichTextBlock
 
 
 class RichTextBlockFactory(wagtail_factories.blocks.BlockFactory):
diff --git a/tbx/core/fields.py b/tbx/core/fields.py
index 3832c17d2..41d0ea834 100644
--- a/tbx/core/fields.py
+++ b/tbx/core/fields.py
@@ -4,6 +4,7 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+
 color_re = re.compile(r"^[A-Fa-f0-9]{6}$")
 color_validator = RegexValidator(color_re, _("Enter a valid color."), "invalid")
 
diff --git a/tbx/core/management/commands/update_youtube_embeds.py b/tbx/core/management/commands/update_youtube_embeds.py
index 464c359fa..cb9703e27 100644
--- a/tbx/core/management/commands/update_youtube_embeds.py
+++ b/tbx/core/management/commands/update_youtube_embeds.py
@@ -6,6 +6,7 @@
 from wagtail.embeds.exceptions import EmbedException
 from wagtail.embeds.models import Embed
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -17,7 +18,6 @@ class Command(BaseCommand):
     """
 
     def handle(self, *args, **options):
-
         youtube_embeds = Embed.objects.filter(provider_name="YouTube")
         urls = list(youtube_embeds.values_list("url", flat=True))
 
diff --git a/tbx/core/migrations/0001_initial.py b/tbx/core/migrations/0001_initial.py
index d79ea4107..c29e13798 100644
--- a/tbx/core/migrations/0001_initial.py
+++ b/tbx/core/migrations/0001_initial.py
@@ -2,19 +2,21 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
-import tbx.core.blocks
-import tbx.core.fields
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
+import tbx.core.fields
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
diff --git a/tbx/core/migrations/0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more.py b/tbx/core/migrations/0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more.py
index a0fc78102..036543426 100644
--- a/tbx/core/migrations/0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more.py
+++ b/tbx/core/migrations/0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0001_initial"),
     ]
diff --git a/tbx/core/migrations/0003_remove_standardpage_additional_content_and_more.py b/tbx/core/migrations/0003_remove_standardpage_additional_content_and_more.py
index 65aaed460..f2471ccb4 100644
--- a/tbx/core/migrations/0003_remove_standardpage_additional_content_and_more.py
+++ b/tbx/core/migrations/0003_remove_standardpage_additional_content_and_more.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.8 on 2024-01-11 11:47
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("torchbox", "0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more"),
     ]
diff --git a/tbx/core/migrations/0004_alter_standardpage_body.py b/tbx/core/migrations/0004_alter_standardpage_body.py
index 0977376f6..329ca51e4 100644
--- a/tbx/core/migrations/0004_alter_standardpage_body.py
+++ b/tbx/core/migrations/0004_alter_standardpage_body.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.8 on 2024-01-11 14:35
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("torchbox", "0003_remove_standardpage_additional_content_and_more"),
     ]
diff --git a/tbx/core/migrations/0005_remove_advert_page_remove_advertplacement_advert_and_more.py b/tbx/core/migrations/0005_remove_advert_page_remove_advertplacement_advert_and_more.py
index fb0ea86b2..f075fd0a8 100644
--- a/tbx/core/migrations/0005_remove_advert_page_remove_advertplacement_advert_and_more.py
+++ b/tbx/core/migrations/0005_remove_advert_page_remove_advertplacement_advert_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0004_alter_standardpage_body"),
     ]
diff --git a/tbx/core/migrations/0006_add_new_image_block_to_body_streamfield.py b/tbx/core/migrations/0006_add_new_image_block_to_body_streamfield.py
index cbf9bb7ef..efe753856 100644
--- a/tbx/core/migrations/0006_add_new_image_block_to_body_streamfield.py
+++ b/tbx/core/migrations/0006_add_new_image_block_to_body_streamfield.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:14
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0005_remove_advert_page_remove_advertplacement_advert_and_more"),
     ]
diff --git a/tbx/core/migrations/0006_alter_standardpage_body.py b/tbx/core/migrations/0006_alter_standardpage_body.py
index 14eac8e04..b9e4d7790 100644
--- a/tbx/core/migrations/0006_alter_standardpage_body.py
+++ b/tbx/core/migrations/0006_alter_standardpage_body.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.9 on 2024-01-15 12:42
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("torchbox", "0005_remove_advert_page_remove_advertplacement_advert_and_more"),
     ]
diff --git a/tbx/core/migrations/0007_alter_standardpage_body.py b/tbx/core/migrations/0007_alter_standardpage_body.py
index 1408cf2f2..e3b70c76e 100644
--- a/tbx/core/migrations/0007_alter_standardpage_body.py
+++ b/tbx/core/migrations/0007_alter_standardpage_body.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.9 on 2024-01-16 13:44
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("torchbox", "0006_alter_standardpage_body"),
     ]
diff --git a/tbx/core/migrations/0007_data_migration_aligned_and_wide_images.py b/tbx/core/migrations/0007_data_migration_aligned_and_wide_images.py
index 0e804e9fa..ab3bdee1c 100644
--- a/tbx/core/migrations/0007_data_migration_aligned_and_wide_images.py
+++ b/tbx/core/migrations/0007_data_migration_aligned_and_wide_images.py
@@ -1,6 +1,7 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:15
 
 from django.db import migrations
+
 from wagtail.blocks.migrations.migrate_operation import MigrateStreamData
 from wagtail.blocks.migrations.operations import RenameStreamChildrenOperation
 
diff --git a/tbx/core/migrations/0008_remove_aligned_and_wide_image_blocks_from_body_streamfield.py b/tbx/core/migrations/0008_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
index d1677244d..0348fea82 100644
--- a/tbx/core/migrations/0008_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
+++ b/tbx/core/migrations/0008_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:53
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0007_data_migration_aligned_and_wide_images"),
     ]
diff --git a/tbx/core/migrations/0009_merge_20240117_1530.py b/tbx/core/migrations/0009_merge_20240117_1530.py
index 9db6240c0..91f55c517 100644
--- a/tbx/core/migrations/0009_merge_20240117_1530.py
+++ b/tbx/core/migrations/0009_merge_20240117_1530.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0007_alter_standardpage_body"),
         ("torchbox", "0008_remove_aligned_and_wide_image_blocks_from_body_streamfield"),
diff --git a/tbx/core/migrations/0010_alter_standardpage_body.py b/tbx/core/migrations/0010_alter_standardpage_body.py
index ff6ade62a..c86a02b4f 100644
--- a/tbx/core/migrations/0010_alter_standardpage_body.py
+++ b/tbx/core/migrations/0010_alter_standardpage_body.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-17 15:31
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0009_merge_20240117_1530"),
     ]
diff --git a/tbx/core/migrations/0011_alter_standardpage_body.py b/tbx/core/migrations/0011_alter_standardpage_body.py
index 17ca108da..54808705f 100644
--- a/tbx/core/migrations/0011_alter_standardpage_body.py
+++ b/tbx/core/migrations/0011_alter_standardpage_body.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-18 13:49
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0010_alter_standardpage_body"),
     ]
diff --git a/tbx/core/migrations/0012_alter_standardpage_body.py b/tbx/core/migrations/0012_alter_standardpage_body.py
index 6050e2570..4a1ca93c4 100644
--- a/tbx/core/migrations/0012_alter_standardpage_body.py
+++ b/tbx/core/migrations/0012_alter_standardpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-18 14:11
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0011_alter_standardpage_body"),
     ]
diff --git a/tbx/core/migrations/0013_add_help_text_to_alt_text_field_in_image_block.py b/tbx/core/migrations/0013_add_help_text_to_alt_text_field_in_image_block.py
index d799a5402..7579a6d3e 100644
--- a/tbx/core/migrations/0013_add_help_text_to_alt_text_field_in_image_block.py
+++ b/tbx/core/migrations/0013_add_help_text_to_alt_text_field_in_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-19 13:09
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0012_alter_standardpage_body"),
     ]
diff --git a/tbx/core/migrations/0014_alter_standardpage_body.py b/tbx/core/migrations/0014_alter_standardpage_body.py
index c391e85c5..d41eab847 100644
--- a/tbx/core/migrations/0014_alter_standardpage_body.py
+++ b/tbx/core/migrations/0014_alter_standardpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-24 10:12
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0013_add_help_text_to_alt_text_field_in_image_block"),
     ]
diff --git a/tbx/core/migrations/0014_data_migration_pageauthor.py b/tbx/core/migrations/0014_data_migration_pageauthor.py
index 4d691cb11..d15a3a2d9 100644
--- a/tbx/core/migrations/0014_data_migration_pageauthor.py
+++ b/tbx/core/migrations/0014_data_migration_pageauthor.py
@@ -2,11 +2,11 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0003_remove_personindexpage_call_to_action_and_more"),
         ("wagtailcore", "0089_log_entry_data_json_null_to_object"),
diff --git a/tbx/core/migrations/0015_merge_20240126_0816.py b/tbx/core/migrations/0015_merge_20240126_0816.py
index 2351ade2e..b5d3bba66 100644
--- a/tbx/core/migrations/0015_merge_20240126_0816.py
+++ b/tbx/core/migrations/0015_merge_20240126_0816.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0014_alter_standardpage_body"),
         ("torchbox", "0014_data_migration_pageauthor"),
diff --git a/tbx/core/migrations/0016_alter_standardpage_body.py b/tbx/core/migrations/0016_alter_standardpage_body.py
index 332fca6a4..1f1266f86 100644
--- a/tbx/core/migrations/0016_alter_standardpage_body.py
+++ b/tbx/core/migrations/0016_alter_standardpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-26 10:39
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0015_merge_20240126_0816"),
     ]
diff --git a/tbx/core/migrations/0017_homepage_theme_standardpage_theme.py b/tbx/core/migrations/0017_homepage_theme_standardpage_theme.py
index 1881a5c38..4554d9f3f 100644
--- a/tbx/core/migrations/0017_homepage_theme_standardpage_theme.py
+++ b/tbx/core/migrations/0017_homepage_theme_standardpage_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0016_alter_standardpage_body"),
     ]
diff --git a/tbx/core/migrations/0018_add_contact_mixin_to_all_page_models.py b/tbx/core/migrations/0018_add_contact_mixin_to_all_page_models.py
index 6871403ac..ddc25bd47 100644
--- a/tbx/core/migrations/0018_add_contact_mixin_to_all_page_models.py
+++ b/tbx/core/migrations/0018_add_contact_mixin_to_all_page_models.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0006_add_contact_mixin_to_all_page_models"),
         ("torchbox", "0017_homepage_theme_standardpage_theme"),
diff --git a/tbx/core/migrations/0019_alter_standardpage_body.py b/tbx/core/migrations/0019_alter_standardpage_body.py
index c06f1f72a..72d3ab062 100644
--- a/tbx/core/migrations/0019_alter_standardpage_body.py
+++ b/tbx/core/migrations/0019_alter_standardpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-26 09:50
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0018_add_contact_mixin_to_all_page_models"),
     ]
diff --git a/tbx/core/migrations/0020_homepagepartnerlogo_remove_homepageheroimage_image_and_more.py b/tbx/core/migrations/0020_homepagepartnerlogo_remove_homepageheroimage_image_and_more.py
index 65d30a4c3..581256307 100644
--- a/tbx/core/migrations/0020_homepagepartnerlogo_remove_homepageheroimage_image_and_more.py
+++ b/tbx/core/migrations/0020_homepagepartnerlogo_remove_homepageheroimage_image_and_more.py
@@ -2,18 +2,19 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("images", "0001_initial"),
         ("torchbox", "0019_alter_standardpage_body"),
diff --git a/tbx/core/migrations/0021_update_label_names.py b/tbx/core/migrations/0021_update_label_names.py
index 96984e1df..60022172f 100644
--- a/tbx/core/migrations/0021_update_label_names.py
+++ b/tbx/core/migrations/0021_update_label_names.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-26 16:31
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         (
             "torchbox",
diff --git a/tbx/core/migrations/0022_add_promo_block_to_homepage_body.py b/tbx/core/migrations/0022_add_promo_block_to_homepage_body.py
index 73557f727..6c4fd3c2e 100644
--- a/tbx/core/migrations/0022_add_promo_block_to_homepage_body.py
+++ b/tbx/core/migrations/0022_add_promo_block_to_homepage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-27 10:25
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0021_update_label_names"),
     ]
diff --git a/tbx/core/migrations/0023_add_wide_image_block.py b/tbx/core/migrations/0023_add_wide_image_block.py
index bdebfa809..483435834 100644
--- a/tbx/core/migrations/0023_add_wide_image_block.py
+++ b/tbx/core/migrations/0023_add_wide_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-27 14:14
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0022_add_promo_block_to_homepage_body"),
     ]
diff --git a/tbx/core/migrations/0024_add_wide_image_block.py b/tbx/core/migrations/0024_add_wide_image_block.py
index 6731781ac..670108476 100644
--- a/tbx/core/migrations/0024_add_wide_image_block.py
+++ b/tbx/core/migrations/0024_add_wide_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-28 08:44
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0023_add_wide_image_block"),
     ]
diff --git a/tbx/core/migrations/0025_add_tabbed_paragraph_block.py b/tbx/core/migrations/0025_add_tabbed_paragraph_block.py
index 69c281704..22717a301 100644
--- a/tbx/core/migrations/0025_add_tabbed_paragraph_block.py
+++ b/tbx/core/migrations/0025_add_tabbed_paragraph_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-29 08:09
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0024_add_wide_image_block"),
     ]
diff --git a/tbx/core/migrations/0026_add_event_block_to_homepage_body.py b/tbx/core/migrations/0026_add_event_block_to_homepage_body.py
index 4e9dc8aee..999d8a1a2 100644
--- a/tbx/core/migrations/0026_add_event_block_to_homepage_body.py
+++ b/tbx/core/migrations/0026_add_event_block_to_homepage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-29 09:01
 
 from django.db import migrations, models
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0025_add_tabbed_paragraph_block"),
     ]
diff --git a/tbx/core/migrations/0027_remove_unneeded_homepage_field.py b/tbx/core/migrations/0027_remove_unneeded_homepage_field.py
index cc9e39398..30a928646 100644
--- a/tbx/core/migrations/0027_remove_unneeded_homepage_field.py
+++ b/tbx/core/migrations/0027_remove_unneeded_homepage_field.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0026_add_event_block_to_homepage_body"),
     ]
diff --git a/tbx/core/migrations/0028_remove_unwanted_blocks_on_homepage.py b/tbx/core/migrations/0028_remove_unwanted_blocks_on_homepage.py
index d58979a77..91b5fc89a 100644
--- a/tbx/core/migrations/0028_remove_unwanted_blocks_on_homepage.py
+++ b/tbx/core/migrations/0028_remove_unwanted_blocks_on_homepage.py
@@ -1,6 +1,7 @@
 # Generated by Django 4.2.9 on 2024-03-04 15:22
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.fields
 import wagtail.images.blocks
@@ -8,7 +9,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0027_remove_unneeded_homepage_field"),
     ]
diff --git a/tbx/core/migrations/0029_update_button_link_on_photocollageblock.py b/tbx/core/migrations/0029_update_button_link_on_photocollageblock.py
index aed6ca19e..ed25cb903 100644
--- a/tbx/core/migrations/0029_update_button_link_on_photocollageblock.py
+++ b/tbx/core/migrations/0029_update_button_link_on_photocollageblock.py
@@ -1,6 +1,7 @@
 # Generated by Django 4.2.9 on 2024-03-05 18:53
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.fields
 import wagtail.images.blocks
@@ -8,7 +9,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0028_remove_unwanted_blocks_on_homepage"),
     ]
diff --git a/tbx/core/migrations/0030_remove_featured_case_study_tagline.py b/tbx/core/migrations/0030_remove_featured_case_study_tagline.py
index 76567f69a..6b938d127 100644
--- a/tbx/core/migrations/0030_remove_featured_case_study_tagline.py
+++ b/tbx/core/migrations/0030_remove_featured_case_study_tagline.py
@@ -1,6 +1,7 @@
 # Generated by Django 4.2.9 on 2024-03-11 12:55
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.fields
 import wagtail.images.blocks
@@ -8,7 +9,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0029_update_button_link_on_photocollageblock"),
     ]
diff --git a/tbx/core/migrations/0030_use_custom_streamfield.py b/tbx/core/migrations/0030_use_custom_streamfield.py
index 78bf82fc4..06e7e259d 100644
--- a/tbx/core/migrations/0030_use_custom_streamfield.py
+++ b/tbx/core/migrations/0030_use_custom_streamfield.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-11 19:43
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0029_update_button_link_on_photocollageblock"),
     ]
diff --git a/tbx/core/migrations/0031_merge_20240315_1052.py b/tbx/core/migrations/0031_merge_20240315_1052.py
index c157677b3..f82da5dab 100644
--- a/tbx/core/migrations/0031_merge_20240315_1052.py
+++ b/tbx/core/migrations/0031_merge_20240315_1052.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-15 10:52
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0030_remove_featured_case_study_tagline"),
         ("torchbox", "0030_use_custom_streamfield"),
diff --git a/tbx/core/migrations/0032_alter_socialmediasettings_site_name.py b/tbx/core/migrations/0032_alter_socialmediasettings_site_name.py
index 777add619..dae203d79 100644
--- a/tbx/core/migrations/0032_alter_socialmediasettings_site_name.py
+++ b/tbx/core/migrations/0032_alter_socialmediasettings_site_name.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0031_merge_20240315_1052"),
     ]
diff --git a/tbx/core/migrations/0033_add_navigation_title_override.py b/tbx/core/migrations/0033_add_navigation_title_override.py
index 1ee30d75e..4de809199 100644
--- a/tbx/core/migrations/0033_add_navigation_title_override.py
+++ b/tbx/core/migrations/0033_add_navigation_title_override.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0032_alter_socialmediasettings_site_name"),
     ]
diff --git a/tbx/core/migrations/0034_add_earth_colour_theme.py b/tbx/core/migrations/0034_add_earth_colour_theme.py
index 5d32b5566..c28326480 100644
--- a/tbx/core/migrations/0034_add_earth_colour_theme.py
+++ b/tbx/core/migrations/0034_add_earth_colour_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0033_add_navigation_title_override"),
     ]
diff --git a/tbx/core/migrations/0035_add_important_page_settings.py b/tbx/core/migrations/0035_add_important_page_settings.py
index f88b6290e..e93ac3630 100644
--- a/tbx/core/migrations/0035_add_important_page_settings.py
+++ b/tbx/core/migrations/0035_add_important_page_settings.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("wagtailcore", "0091_remove_revision_submitted_for_moderation"),
         ("torchbox", "0034_add_earth_colour_theme"),
diff --git a/tbx/core/migrations/0035_remove_address_settings.py b/tbx/core/migrations/0035_remove_address_settings.py
index 8f48af674..4b8410f8c 100644
--- a/tbx/core/migrations/0035_remove_address_settings.py
+++ b/tbx/core/migrations/0035_remove_address_settings.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0034_add_earth_colour_theme"),
     ]
diff --git a/tbx/core/migrations/0036_delete_unused_tag_snippet.py b/tbx/core/migrations/0036_delete_unused_tag_snippet.py
index d98f8b6b2..9e67a44d5 100644
--- a/tbx/core/migrations/0036_delete_unused_tag_snippet.py
+++ b/tbx/core/migrations/0036_delete_unused_tag_snippet.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0035_remove_address_settings"),
     ]
diff --git a/tbx/core/migrations/0037_merge_20240725_1000.py b/tbx/core/migrations/0037_merge_20240725_1000.py
index 55f4e55bc..b02eedea9 100644
--- a/tbx/core/migrations/0037_merge_20240725_1000.py
+++ b/tbx/core/migrations/0037_merge_20240725_1000.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("torchbox", "0035_add_important_page_settings"),
         ("torchbox", "0036_delete_unused_tag_snippet"),
diff --git a/tbx/core/models.py b/tbx/core/models.py
index c2303796c..8af14912e 100644
--- a/tbx/core/models.py
+++ b/tbx/core/models.py
@@ -2,13 +2,6 @@
 from django.utils.functional import cached_property
 
 from modelcluster.fields import ParentalKey
-from tbx.core.utils.fields import StreamField
-from tbx.core.utils.models import (
-    ColourThemeMixin,
-    NavigationFields,
-    SocialFields,
-)
-from tbx.people.models import ContactMixin
 from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
 from wagtail.blocks import PageChooserBlock, StreamBlock, StructBlock
 from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
@@ -17,6 +10,14 @@
 from wagtail.search import index
 from wagtail.snippets.models import register_snippet
 
+from tbx.core.utils.fields import StreamField
+from tbx.core.utils.models import (
+    ColourThemeMixin,
+    NavigationFields,
+    SocialFields,
+)
+from tbx.people.models import ContactMixin
+
 from .blocks import HomePageStoryBlock, StandardPageStoryBlock
 
 
@@ -57,15 +58,6 @@ class LinkFields(models.Model):
         related_name="+",
     )
 
-    @property
-    def link(self):
-        if self.link_page:
-            return self.link_page.url
-        elif self.link_document:
-            return self.link_document.url
-        else:
-            return self.link_external
-
     panels = [
         FieldPanel("link_external"),
         FieldPanel("link_page"),
@@ -75,6 +67,15 @@ def link(self):
     class Meta:
         abstract = True
 
+    @property
+    def link(self):
+        if self.link_page_id:
+            return self.link_page.url
+        elif self.link_document:
+            return self.link_document.url
+        else:
+            return self.link_external
+
 
 # Carousel items
 class CarouselItem(LinkFields):
@@ -196,7 +197,7 @@ class StandardPage(
 
 
 # No longer in use but kept for migration history
-class Tag(models.Model):
+class Tag(models.Model):  # noqa: DJ008
     pass
 
 
diff --git a/tbx/core/templatetags/reading_time_tags.py b/tbx/core/templatetags/reading_time_tags.py
index ac7557693..417c5470c 100644
--- a/tbx/core/templatetags/reading_time_tags.py
+++ b/tbx/core/templatetags/reading_time_tags.py
@@ -3,8 +3,10 @@
 from django import template
 
 from bs4 import BeautifulSoup
+
 from tbx.core.blocks import ImageBlock
 
+
 register = template.Library()
 
 # Using value of 275 words per minute.
diff --git a/tbx/core/templatetags/torchbox_tags.py b/tbx/core/templatetags/torchbox_tags.py
index 649325cc7..cf88756be 100644
--- a/tbx/core/templatetags/torchbox_tags.py
+++ b/tbx/core/templatetags/torchbox_tags.py
@@ -4,6 +4,7 @@
 from tbx.blog.models import BlogPage
 from tbx.core.models import MainMenu
 
+
 register = template.Library()
 
 
@@ -95,16 +96,10 @@ def time_display(time):
     hour_string = str(hour)
 
     # Minute string
-    if minute != 0:
-        minute_string = "." + str(minute)
-    else:
-        minute_string = ""
+    minute_string = "." + str(minute) if minute != 0 else ""
 
     # PM string
-    if pm:
-        pm_string = "pm"
-    else:
-        pm_string = "am"
+    pm_string = "pm" if pm else "am"
 
     # Join and return
     return "".join([hour_string, minute_string, pm_string])
diff --git a/tbx/core/templatetags/util_tags.py b/tbx/core/templatetags/util_tags.py
index 75dc15f30..3bdfdb194 100644
--- a/tbx/core/templatetags/util_tags.py
+++ b/tbx/core/templatetags/util_tags.py
@@ -1,9 +1,11 @@
 from django import template
 from django.utils.text import camel_case_to_spaces, slugify
 
-from tbx.core.utils.models import SocialMediaSettings
 from wagtail.blocks import StreamValue
 
+from tbx.core.utils.models import SocialMediaSettings
+
+
 register = template.Library()
 
 
diff --git a/tbx/core/tests/test_colour_theme.py b/tbx/core/tests/test_colour_theme.py
index 240f4fa17..a83f7798b 100644
--- a/tbx/core/tests/test_colour_theme.py
+++ b/tbx/core/tests/test_colour_theme.py
@@ -1,6 +1,10 @@
 from django.utils.text import slugify
 
+from wagtail.models import Site
+from wagtail.test.utils import WagtailPageTestCase
+
 from bs4 import BeautifulSoup
+
 from tbx.blog.factories import BlogIndexPageFactory, BlogPageFactory
 from tbx.core.factories import HomePageFactory, StandardPageFactory
 from tbx.core.utils.models import ColourTheme
@@ -9,8 +13,6 @@
     WorkIndexPageFactory,
     WorkPageFactory,
 )
-from wagtail.models import Site
-from wagtail.test.utils import WagtailPageTestCase
 
 
 class TestColourTheme(WagtailPageTestCase):
diff --git a/tbx/core/tests/test_models.py b/tbx/core/tests/test_models.py
index d80226088..11cc55291 100644
--- a/tbx/core/tests/test_models.py
+++ b/tbx/core/tests/test_models.py
@@ -1,5 +1,3 @@
-from tbx.core.factories import HomePageFactory, StandardPageFactory
-from tbx.core.models import HomePage, StandardPage
 from wagtail.models import Site
 from wagtail.test.utils import WagtailPageTestCase
 from wagtail.test.utils.form_data import (
@@ -8,6 +6,9 @@
     streamfield,
 )
 
+from tbx.core.factories import HomePageFactory, StandardPageFactory
+from tbx.core.models import HomePage, StandardPage
+
 
 class TestHomePageFactory(WagtailPageTestCase):
     def test_create(self):
diff --git a/tbx/core/tests/test_views.py b/tbx/core/tests/test_views.py
index ab9c2ff9d..d10de9b3b 100644
--- a/tbx/core/tests/test_views.py
+++ b/tbx/core/tests/test_views.py
@@ -1,9 +1,10 @@
 from django.test import TestCase, override_settings
 from django.urls import reverse
 
-from tbx.core.factories import HomePageFactory
 from wagtail.models import Site
 
+from tbx.core.factories import HomePageFactory
+
 
 class SecurityViewTestCase(TestCase):
     url = reverse("security-txt")
@@ -24,20 +25,20 @@ def test_accessible(self) -> None:
 class TestModeSwitcherView(TestCase):
     def test_view_sets_cookie(self):
         resp = self.client.get(
-            reverse("switch_mode"), data=dict(switch_mode=mode, next_url="/")
+            reverse("switch_mode"), data={"switch_mode": mode, "next_url": "/"}
         )
         self.assertEqual(resp.cookies["torchbox-mode"].value, mode)
 
     def test_view_redirects_to_original_url(self):
         resp = self.client.get(
-            reverse("switch_mode"), data=dict(switch_mode=mode, next_url="/")
+            reverse("switch_mode"), data={"switch_mode": mode, "next_url": "/"}
         )
         self.assertRedirects(resp, "/")
 
     def test_mode_is_set_on_subsequent_requests(self):
         self.client.get(
             reverse("switch_mode"),
-            data=dict(switch_mode=mode, next_url="/"),
+            data={"switch_mode": mode, "next_url": "/"},
             headers={"accept": "text/html"},
         )
 
@@ -47,7 +48,7 @@ def test_mode_is_set_on_subsequent_requests(self):
     def test_mode_cannot_be_outside_of_specific_values(self):
         resp = self.client.get(
             reverse("switch_mode"),
-            data=dict(switch_mode="some random value", next_url="/"),
+            data={"switch_mode": "some random value", "next_url": "/"},
             headers={"accept": "text/html"},
         )
 
@@ -61,14 +62,14 @@ def test_setting_random_mode_doesnt_work(self):
         # set valid mode
         self.client.get(
             reverse("switch_mode"),
-            data=dict(switch_mode=mode, next_url="/"),
+            data={"switch_mode": mode, "next_url": "/"},
             headers={"accept": "text/html"},
         )
 
         # set invalid mode
         self.client.get(
             reverse("switch_mode"),
-            data=dict(switch_mode="some random value", next_url="/"),
+            data={"switch_mode": "some random value", "next_url": "/"},
             headers={"accept": "text/html"},
         )
 
@@ -96,7 +97,7 @@ def test_setting_theme_on_one_site_sets_it_on_multiple_sites(self):
         # set theme on default site
         self.client.get(
             reverse("switch_mode"),
-            data=dict(switch_mode=mode, next_url="/"),
+            data={"switch_mode": mode, "next_url": "/"},
         )
 
         # check theme is set on default site
diff --git a/tbx/core/urls.py b/tbx/core/urls.py
index d5a5e4b5e..f2a4d0ccd 100644
--- a/tbx/core/urls.py
+++ b/tbx/core/urls.py
@@ -3,6 +3,7 @@
 from tbx.blog.feeds import BlogFeed
 from tbx.core import views
 
+
 urlpatterns = [
     path("blog/feed/", BlogFeed(), name="blog_feed"),
     path("newsletter-subscribe", views.newsletter_subsribe),
diff --git a/tbx/core/utils/__init__.py b/tbx/core/utils/__init__.py
index ea57dc815..dae93b0e5 100644
--- a/tbx/core/utils/__init__.py
+++ b/tbx/core/utils/__init__.py
@@ -1,5 +1,5 @@
-import hashlib
 from datetime import datetime, time, timedelta
+import hashlib
 from itertools import cycle, islice
 
 
@@ -27,14 +27,10 @@ def export_event(event, format="ical"):
         date = event.date_from + timedelta(days=day)
 
         # Get times
-        if event.time_from is not None:
-            start_time = event.time_from
-        else:
-            start_time = datetime.time.min
-        if event.time_to is not None:
-            end_time = event.time_to
-        else:
-            end_time = time.max
+        start_time = (
+            event.time_from if event.time_from is not None else datetime.time.min
+        )
+        end_time = event.time_to if event.time_to is not None else time.max
 
         # Combine dates and times
         start_datetime = datetime.combine(date, start_time)
@@ -49,8 +45,13 @@ def add_slashes(string):
             string.replace("\n", "\\n")
             return string
 
-        # Make a uid
-        uid = hashlib.sha1(event.url + str(start_datetime)).hexdigest() + "@wagtaildemo"
+        # Make an uid
+        uid = (
+            hashlib.sha1(
+                event.url + str(start_datetime), usedforsecurity=False
+            ).hexdigest()
+            + "@torchbox.com"
+        )
 
         # Make event
         ical_components.extend(
diff --git a/tbx/core/utils/migrations.py b/tbx/core/utils/migrations.py
index 693a6249b..a2da95d30 100644
--- a/tbx/core/utils/migrations.py
+++ b/tbx/core/utils/migrations.py
@@ -1,5 +1,5 @@
-import json
 from functools import wraps
+import json
 
 from django.core.exceptions import FieldError
 
diff --git a/tbx/core/utils/models.py b/tbx/core/utils/models.py
index 32f0e5b78..826465a58 100644
--- a/tbx/core/utils/models.py
+++ b/tbx/core/utils/models.py
@@ -7,6 +7,7 @@
 from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
 from wagtail.models import Orderable
 
+
 SEARCH_DESCRIPTION_LABEL = "Meta description"  # NOTE changing this requires migrations
 
 
@@ -111,6 +112,11 @@ class ColourThemeMixin(models.Model):
         ),
     )
 
+    promote_panels = [FieldPanel("theme")]
+
+    class Meta:
+        abstract = True
+
     @property
     def theme_class(self):
         if theme := self.theme:
@@ -124,8 +130,3 @@ def theme_class(self):
             )
         except StopIteration:
             return ColourTheme.NONE
-
-    promote_panels = [FieldPanel("theme")]
-
-    class Meta:
-        abstract = True
diff --git a/tbx/core/utils/scripts/run_flightpath.py b/tbx/core/utils/scripts/run_flightpath.py
index af06ae726..cbde44b9f 100644
--- a/tbx/core/utils/scripts/run_flightpath.py
+++ b/tbx/core/utils/scripts/run_flightpath.py
@@ -20,14 +20,14 @@ def get_flightpath_args_from_env():
             "flightpath_url": os.environ["FLIGHTPATH_URL"],
         }
 
-    except KeyError:
+    except KeyError as err:
         raise KeyError(
             "You need the following environment variables to run flightpath: "
             "FLIGHTPATH_URL, HEROKU_APP_NAME_PRODUCTION, "
             "HEROKU_APP_NAME_STAGING, FLIGHTPATH_AUTH_KEY, "
             "DEPLOYMENT_KEY. This should be set on GitHub "
             "secrets if running as GitHub Actions."
-        )
+        ) from err
 
     return args
 
@@ -52,6 +52,7 @@ def post_to_flightpath(
         headers={
             "Authorization": f"Token {flightpath_auth_key}",
         },
+        timeout=30,
     )
 
     response.raise_for_status()
diff --git a/tbx/core/utils/scripts/run_flightpath_status_check.py b/tbx/core/utils/scripts/run_flightpath_status_check.py
index fce391179..7718d2abf 100644
--- a/tbx/core/utils/scripts/run_flightpath_status_check.py
+++ b/tbx/core/utils/scripts/run_flightpath_status_check.py
@@ -18,12 +18,12 @@ def get_flightpath_args_from_env():
             "flightpath_url": os.environ["FLIGHTPATH_URL"],
         }
 
-    except KeyError:
+    except KeyError as err:
         raise KeyError(
             "You need the following environment variables to run flightpath: "
             "FLIGHTPATH_URL, FLIGHTPATH_AUTH_KEY. "
             "This should be set on GitHub secrets if running as GitHub Actions."
-        )
+        ) from err
 
     return args
 
@@ -38,6 +38,7 @@ def get_flightpath_job_status(flightpath_url, flightpath_auth_key, job_id):
         headers={
             "Authorization": f"Token {flightpath_auth_key}",
         },
+        timeout=30,
     )
     response.raise_for_status()
     return response
diff --git a/tbx/core/views.py b/tbx/core/views.py
index 47fdec635..a3e80e54f 100644
--- a/tbx/core/views.py
+++ b/tbx/core/views.py
@@ -1,5 +1,5 @@
-import logging
 from datetime import timedelta
+import logging
 
 from django.conf import settings
 from django.http import HttpResponse, HttpResponseNotFound
@@ -11,9 +11,11 @@
 from django.views.generic import TemplateView
 
 import requests
+
 from tbx.core.errors import UnauthorizedHTTPError
 from tbx.core.forms import ModeSwitcherForm
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -28,6 +30,7 @@ def newsletter_subsribe(request):
                 "id": settings.MAILCHIMP_MAILING_LIST_ID,
                 "email": {"email": request.GET.get("email")},
             },
+            timeout=20,
         )
     return HttpResponse()
 
diff --git a/tbx/core/wagtail_hooks.py b/tbx/core/wagtail_hooks.py
index d439c160e..dbed8f654 100644
--- a/tbx/core/wagtail_hooks.py
+++ b/tbx/core/wagtail_hooks.py
@@ -6,13 +6,14 @@
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
-from PIL import ImageEnhance
-from storages.backends.s3 import S3Storage
 from wagtail import hooks
 from wagtail.documents import get_document_model
 from wagtail.documents.models import document_served
 from wagtail.images.image_operations import FilterOperation
 
+from PIL import ImageEnhance
+from storages.backends.s3 import S3Storage
+
 
 @hooks.register("before_serve_document", order=100)
 def serve_document_from_s3(document, request):
@@ -51,7 +52,7 @@ def hotjar_admin_tracking():
     if not hjid:
         return ""
 
-    return mark_safe(
+    return mark_safe(  # noqa: S308
         f"""
     <script>
         (function(h,o,t,j,a,r){{
diff --git a/tbx/events/blocks.py b/tbx/events/blocks.py
index b01694319..bce7eb8e3 100644
--- a/tbx/events/blocks.py
+++ b/tbx/events/blocks.py
@@ -1,6 +1,7 @@
-from tbx.core.blocks import BaseEventBlock
 from wagtail.images.blocks import ImageChooserBlock
 
+from tbx.core.blocks import BaseEventBlock
+
 
 class EventItemBlock(BaseEventBlock):
     image = ImageChooserBlock(required=False)
diff --git a/tbx/events/migrations/0001_initial.py b/tbx/events/migrations/0001_initial.py
index cd9903149..0adcf69dd 100644
--- a/tbx/events/migrations/0001_initial.py
+++ b/tbx/events/migrations/0001_initial.py
@@ -2,6 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
 import wagtail.blocks
 import wagtail.embeds.blocks
@@ -10,7 +11,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
diff --git a/tbx/events/migrations/0002_remove_eventindexpage_call_to_action_and_more.py b/tbx/events/migrations/0002_remove_eventindexpage_call_to_action_and_more.py
index 6d0803f9a..35ee1d99a 100644
--- a/tbx/events/migrations/0002_remove_eventindexpage_call_to_action_and_more.py
+++ b/tbx/events/migrations/0002_remove_eventindexpage_call_to_action_and_more.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-02-07 14:46
 
 from django.db import migrations, models
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"),
         ("events", "0001_initial"),
diff --git a/tbx/events/migrations/0003_add_contact_mixin_to_all_page_models.py b/tbx/events/migrations/0003_add_contact_mixin_to_all_page_models.py
index 33b482d78..b55bae5e0 100644
--- a/tbx/events/migrations/0003_add_contact_mixin_to_all_page_models.py
+++ b/tbx/events/migrations/0003_add_contact_mixin_to_all_page_models.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0006_add_contact_mixin_to_all_page_models"),
         ("events", "0002_remove_eventindexpage_call_to_action_and_more"),
diff --git a/tbx/events/migrations/0004_alter_event_related_sectors.py b/tbx/events/migrations/0004_alter_event_related_sectors.py
index 107f85450..8206e5775 100644
--- a/tbx/events/migrations/0004_alter_event_related_sectors.py
+++ b/tbx/events/migrations/0004_alter_event_related_sectors.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-02-19 14:46
 
 from django.db import migrations
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"),
         ("events", "0003_add_contact_mixin_to_all_page_models"),
diff --git a/tbx/events/migrations/0005_eventindexpage_events_delete_event.py b/tbx/events/migrations/0005_eventindexpage_events_delete_event.py
index 042de5ffd..8fbab2b1d 100644
--- a/tbx/events/migrations/0005_eventindexpage_events_delete_event.py
+++ b/tbx/events/migrations/0005_eventindexpage_events_delete_event.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-22 14:20
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("events", "0004_alter_event_related_sectors"),
     ]
diff --git a/tbx/events/migrations/0006_eventindexpage_no_events_message.py b/tbx/events/migrations/0006_eventindexpage_no_events_message.py
index adc9daf05..75038e47f 100644
--- a/tbx/events/migrations/0006_eventindexpage_no_events_message.py
+++ b/tbx/events/migrations/0006_eventindexpage_no_events_message.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.11 on 2024-04-12 08:40
 
 from django.db import migrations
+
 import wagtail.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("events", "0005_eventindexpage_events_delete_event"),
     ]
diff --git a/tbx/events/migrations/0007_add_navigation_title_override.py b/tbx/events/migrations/0007_add_navigation_title_override.py
index 93bd7ec5f..210a8026d 100644
--- a/tbx/events/migrations/0007_add_navigation_title_override.py
+++ b/tbx/events/migrations/0007_add_navigation_title_override.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("events", "0006_eventindexpage_no_events_message"),
     ]
diff --git a/tbx/events/migrations/0008_add_earth_colour_theme.py b/tbx/events/migrations/0008_add_earth_colour_theme.py
index 181f8217b..45885ab3b 100644
--- a/tbx/events/migrations/0008_add_earth_colour_theme.py
+++ b/tbx/events/migrations/0008_add_earth_colour_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("events", "0007_add_navigation_title_override"),
     ]
diff --git a/tbx/events/models.py b/tbx/events/models.py
index 7804d39bb..48423fe16 100644
--- a/tbx/events/models.py
+++ b/tbx/events/models.py
@@ -2,6 +2,10 @@
 from django.utils import timezone
 from django.utils.http import urlencode
 
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Page
+
 from tbx.core.utils.fields import StreamField
 from tbx.core.utils.models import (
     ColourThemeMixin,
@@ -10,9 +14,6 @@
 )
 from tbx.events.blocks import EventItemBlock
 from tbx.people.models import ContactMixin
-from wagtail.admin.panels import FieldPanel, MultiFieldPanel
-from wagtail.fields import RichTextField
-from wagtail.models import Page
 
 
 class EventIndexPage(
diff --git a/tbx/images/factories.py b/tbx/images/factories.py
index 4457f3863..8a19e359b 100644
--- a/tbx/images/factories.py
+++ b/tbx/images/factories.py
@@ -1,6 +1,7 @@
-from tbx.images.models import CustomImage
 from wagtail_factories import ImageFactory
 
+from tbx.images.models import CustomImage
+
 
 class CustomImageFactory(ImageFactory):
     class Meta:
diff --git a/tbx/images/migrations/0001_initial.py b/tbx/images/migrations/0001_initial.py
index 394284233..82ebbbffc 100644
--- a/tbx/images/migrations/0001_initial.py
+++ b/tbx/images/migrations/0001_initial.py
@@ -3,14 +3,15 @@
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import taggit.managers
+
 import wagtail.images.models
 import wagtail.models.collections
 import wagtail.search.index
 
+import taggit.managers
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
diff --git a/tbx/images/migrations/0002_customimage_description.py b/tbx/images/migrations/0002_customimage_description.py
index bdd8ef17b..82801f385 100644
--- a/tbx/images/migrations/0002_customimage_description.py
+++ b/tbx/images/migrations/0002_customimage_description.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("images", "0001_initial"),
     ]
diff --git a/tbx/impact_reports/blocks.py b/tbx/impact_reports/blocks.py
index 5b530d161..3eec50dcc 100644
--- a/tbx/impact_reports/blocks.py
+++ b/tbx/impact_reports/blocks.py
@@ -1,9 +1,3 @@
-from tbx.core.blocks import (
-    CustomImageChooserBlock,
-    NumericStatisticsBlock,
-    StoryBlock,
-    TextualStatisticsBlock,
-)
 from wagtail.blocks import (
     CharBlock,
     ListBlock,
@@ -12,6 +6,13 @@
     URLBlock,
 )
 
+from tbx.core.blocks import (
+    CustomImageChooserBlock,
+    NumericStatisticsBlock,
+    StoryBlock,
+    TextualStatisticsBlock,
+)
+
 
 class ImpactReportHeadingBlock(StructBlock):
     image = CustomImageChooserBlock(
diff --git a/tbx/impact_reports/migrations/0001_initial.py b/tbx/impact_reports/migrations/0001_initial.py
index a4379bf43..6b257768b 100644
--- a/tbx/impact_reports/migrations/0001_initial.py
+++ b/tbx/impact_reports/migrations/0001_initial.py
@@ -2,12 +2,13 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import tbx.core.utils.fields
+
 import wagtail.fields
 
+import tbx.core.utils.fields
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
diff --git a/tbx/impact_reports/migrations/0002_update_impact_report_fields.py b/tbx/impact_reports/migrations/0002_update_impact_report_fields.py
index 5e2db5b47..58bd42423 100644
--- a/tbx/impact_reports/migrations/0002_update_impact_report_fields.py
+++ b/tbx/impact_reports/migrations/0002_update_impact_report_fields.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0007_use_custom_streamfield"),
         ("images", "0001_initial"),
diff --git a/tbx/impact_reports/migrations/0003_add_navigation_title_override.py b/tbx/impact_reports/migrations/0003_add_navigation_title_override.py
index 83303185c..1579c0b9f 100644
--- a/tbx/impact_reports/migrations/0003_add_navigation_title_override.py
+++ b/tbx/impact_reports/migrations/0003_add_navigation_title_override.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("impact_reports", "0002_update_impact_report_fields"),
     ]
diff --git a/tbx/impact_reports/migrations/0004_add_earth_colour_theme.py b/tbx/impact_reports/migrations/0004_add_earth_colour_theme.py
index aed3af961..9468c3839 100644
--- a/tbx/impact_reports/migrations/0004_add_earth_colour_theme.py
+++ b/tbx/impact_reports/migrations/0004_add_earth_colour_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("impact_reports", "0003_add_navigation_title_override"),
     ]
diff --git a/tbx/impact_reports/models.py b/tbx/impact_reports/models.py
index 9a83329fc..a4a0fff32 100755
--- a/tbx/impact_reports/models.py
+++ b/tbx/impact_reports/models.py
@@ -2,14 +2,6 @@
 from django.utils.functional import cached_property
 from django.utils.text import slugify
 
-from tbx.core.utils.fields import StreamField
-from tbx.core.utils.models import (
-    ColourThemeMixin,
-    NavigationFields,
-    SocialFields,
-)
-from tbx.impact_reports.blocks import ImpactReportStoryBlock
-from tbx.people.models import ContactMixin
 from wagtail.admin.panels import (
     FieldPanel,
     InlinePanel,
@@ -19,6 +11,15 @@
 from wagtail.models import Page
 from wagtail.search import index
 
+from tbx.core.utils.fields import StreamField
+from tbx.core.utils.models import (
+    ColourThemeMixin,
+    NavigationFields,
+    SocialFields,
+)
+from tbx.impact_reports.blocks import ImpactReportStoryBlock
+from tbx.people.models import ContactMixin
+
 
 class ImpactReportPage(
     ColourThemeMixin, ContactMixin, SocialFields, NavigationFields, Page
diff --git a/tbx/navigation/blocks.py b/tbx/navigation/blocks.py
index ca6f3ef7a..ddddc87be 100644
--- a/tbx/navigation/blocks.py
+++ b/tbx/navigation/blocks.py
@@ -2,10 +2,11 @@
 from django.db import models
 from django.forms.utils import ErrorList
 
-from tbx.core.blocks import CustomImageChooserBlock
 from wagtail import blocks
 from wagtail.blocks.struct_block import StructBlockValidationError
 
+from tbx.core.blocks import CustomImageChooserBlock
+
 
 class LinkBlockStructValue(blocks.StructValue):
     def url(self):
diff --git a/tbx/navigation/migrations/0001_initial.py b/tbx/navigation/migrations/0001_initial.py
index 62c4413fa..97ef713b7 100644
--- a/tbx/navigation/migrations/0001_initial.py
+++ b/tbx/navigation/migrations/0001_initial.py
@@ -2,13 +2,13 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import wagtail.blocks
 import wagtail.fields
 import wagtail.images.blocks
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
diff --git a/tbx/navigation/migrations/0002_alter_navigationsettings_primary_navigation.py b/tbx/navigation/migrations/0002_alter_navigationsettings_primary_navigation.py
index 42f9221a5..e101ae568 100644
--- a/tbx/navigation/migrations/0002_alter_navigationsettings_primary_navigation.py
+++ b/tbx/navigation/migrations/0002_alter_navigationsettings_primary_navigation.py
@@ -1,12 +1,12 @@
 # Generated by Django 4.2.9 on 2024-02-07 22:21
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("navigation", "0001_initial"),
     ]
diff --git a/tbx/navigation/migrations/0003_alter_navigationsettings_footer_logos.py b/tbx/navigation/migrations/0003_alter_navigationsettings_footer_logos.py
index 8c4efbd92..7cb590438 100644
--- a/tbx/navigation/migrations/0003_alter_navigationsettings_footer_logos.py
+++ b/tbx/navigation/migrations/0003_alter_navigationsettings_footer_logos.py
@@ -1,12 +1,12 @@
 # Generated by Django 4.2.9 on 2024-02-08 17:24
 
 from django.db import migrations
+
 import wagtail.fields
 import wagtail.images.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("navigation", "0002_alter_navigationsettings_primary_navigation"),
     ]
diff --git a/tbx/navigation/migrations/0004_alter_navigationsettings_footer_logos.py b/tbx/navigation/migrations/0004_alter_navigationsettings_footer_logos.py
index 4d6d28457..31e557d89 100644
--- a/tbx/navigation/migrations/0004_alter_navigationsettings_footer_logos.py
+++ b/tbx/navigation/migrations/0004_alter_navigationsettings_footer_logos.py
@@ -1,13 +1,13 @@
 # Generated by Django 4.2.9 on 2024-02-16 17:56
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.fields
 import wagtail.images.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("navigation", "0003_alter_navigationsettings_footer_logos"),
     ]
diff --git a/tbx/navigation/migrations/0005_navigationsettings_primary_navigation_child_display_behaviour.py b/tbx/navigation/migrations/0005_navigationsettings_primary_navigation_child_display_behaviour.py
index 45f1aaa3c..143d5adcd 100644
--- a/tbx/navigation/migrations/0005_navigationsettings_primary_navigation_child_display_behaviour.py
+++ b/tbx/navigation/migrations/0005_navigationsettings_primary_navigation_child_display_behaviour.py
@@ -1,12 +1,12 @@
 # Generated by Django 4.2.9 on 2024-03-07 11:27
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("navigation", "0004_alter_navigationsettings_footer_logos"),
     ]
diff --git a/tbx/navigation/migrations/0006_use_custom_streamfield.py b/tbx/navigation/migrations/0006_use_custom_streamfield.py
index 59e0352ab..e2651517c 100644
--- a/tbx/navigation/migrations/0006_use_custom_streamfield.py
+++ b/tbx/navigation/migrations/0006_use_custom_streamfield.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-15 09:04
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         (
             "navigation",
diff --git a/tbx/navigation/models.py b/tbx/navigation/models.py
index 6c33cc693..67225e4e7 100644
--- a/tbx/navigation/models.py
+++ b/tbx/navigation/models.py
@@ -2,14 +2,15 @@
 from django.core.cache.utils import make_template_fragment_key
 
 from modelcluster.models import ClusterableModel
+from wagtail.admin.panels import FieldPanel
+from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
+
 from tbx.core.utils.fields import StreamField
 from tbx.navigation.blocks import (
     FooterLogoBlock,
     LinkBlock,
     PrimaryNavLinkBlock,
 )
-from wagtail.admin.panels import FieldPanel
-from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
 
 
 @register_setting(icon="list-ul")
diff --git a/tbx/navigation/templatetags/navigation_tags.py b/tbx/navigation/templatetags/navigation_tags.py
index 21d8d600c..c3a0ce648 100644
--- a/tbx/navigation/templatetags/navigation_tags.py
+++ b/tbx/navigation/templatetags/navigation_tags.py
@@ -1,5 +1,6 @@
 from django import template
 
+
 register = template.Library()
 
 
diff --git a/tbx/navigation/tests/test_link_block.py b/tbx/navigation/tests/test_link_block.py
index ef51f562a..9e43cde63 100644
--- a/tbx/navigation/tests/test_link_block.py
+++ b/tbx/navigation/tests/test_link_block.py
@@ -2,6 +2,7 @@
 from django.test import TestCase
 
 import wagtail_factories
+
 from tbx.core.models import HomePage
 from tbx.images.models import CustomImage
 from tbx.navigation.blocks import (
diff --git a/tbx/people/factories.py b/tbx/people/factories.py
index c92242baf..c1c71942d 100644
--- a/tbx/people/factories.py
+++ b/tbx/people/factories.py
@@ -2,9 +2,10 @@
 import logging
 
 import factory
-import wagtail_factories
 from factory.django import DjangoModelFactory
 from faker import Faker
+import wagtail_factories
+
 from tbx.core.factories import StandardPageFactory
 from tbx.core.models import HomePage
 from tbx.images.factories import CustomImageFactory
@@ -19,6 +20,7 @@
 from tbx.taxonomy.factories import TeamFactory
 from tbx.taxonomy.models import Team
 
+
 faker = Faker(["en_GB"])
 logger = logging.getLogger(__name__)
 
@@ -105,7 +107,7 @@ def cta(obj, create, extracted, **kwargs):
                         ", ".join(acceptable_link_types)
                     )
                 )
-            if page and not link_type == "internal_link":
+            if page and link_type != "internal_link":
                 logger.warning(
                     "Page argument ignored because link type is not 'internal_link'"
                 )
diff --git a/tbx/people/migrations/0001_initial.py b/tbx/people/migrations/0001_initial.py
index 83c738fe0..14ecea838 100644
--- a/tbx/people/migrations/0001_initial.py
+++ b/tbx/people/migrations/0001_initial.py
@@ -2,17 +2,18 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
-import phonenumber_field.modelfields
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.search.index
 
+import phonenumber_field.modelfields
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
diff --git a/tbx/people/migrations/0002_remove_culturepagekeypoint_linked_page_and_more.py b/tbx/people/migrations/0002_remove_culturepagekeypoint_linked_page_and_more.py
index ff6389b57..669b9effa 100644
--- a/tbx/people/migrations/0002_remove_culturepagekeypoint_linked_page_and_more.py
+++ b/tbx/people/migrations/0002_remove_culturepagekeypoint_linked_page_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0001_initial"),
     ]
diff --git a/tbx/people/migrations/0003_remove_personindexpage_call_to_action_and_more.py b/tbx/people/migrations/0003_remove_personindexpage_call_to_action_and_more.py
index 6e10c12db..4a8a6b856 100644
--- a/tbx/people/migrations/0003_remove_personindexpage_call_to_action_and_more.py
+++ b/tbx/people/migrations/0003_remove_personindexpage_call_to_action_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0002_remove_culturepagekeypoint_linked_page_and_more"),
     ]
diff --git a/tbx/people/migrations/0004_personindexpage_theme_personpage_theme.py b/tbx/people/migrations/0004_personindexpage_theme_personpage_theme.py
index af6d98f9c..3ce7d2604 100644
--- a/tbx/people/migrations/0004_personindexpage_theme_personpage_theme.py
+++ b/tbx/people/migrations/0004_personindexpage_theme_personpage_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0003_remove_personindexpage_call_to_action_and_more"),
     ]
diff --git a/tbx/people/migrations/0005_remove_personpage_is_senior_personpage_related_teams_and_more.py b/tbx/people/migrations/0005_remove_personpage_is_senior_personpage_related_teams_and_more.py
index 2af0e9906..2d7c2f82d 100644
--- a/tbx/people/migrations/0005_remove_personpage_is_senior_personpage_related_teams_and_more.py
+++ b/tbx/people/migrations/0005_remove_personpage_is_senior_personpage_related_teams_and_more.py
@@ -2,12 +2,12 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
 import wagtail.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"),
         ("images", "0001_initial"),
diff --git a/tbx/people/migrations/0006_add_contact_mixin_to_all_page_models.py b/tbx/people/migrations/0006_add_contact_mixin_to_all_page_models.py
index ed9f71e38..6adaf8edf 100644
--- a/tbx/people/migrations/0006_add_contact_mixin_to_all_page_models.py
+++ b/tbx/people/migrations/0006_add_contact_mixin_to_all_page_models.py
@@ -2,12 +2,12 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import wagtail.blocks
 import wagtail.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         (
             "people",
diff --git a/tbx/people/migrations/0007_use_custom_streamfield.py b/tbx/people/migrations/0007_use_custom_streamfield.py
index dbfab7309..6121fd966 100644
--- a/tbx/people/migrations/0007_use_custom_streamfield.py
+++ b/tbx/people/migrations/0007_use_custom_streamfield.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-11 19:43
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0006_add_contact_mixin_to_all_page_models"),
     ]
diff --git a/tbx/people/migrations/0008_add_navigation_title_override.py b/tbx/people/migrations/0008_add_navigation_title_override.py
index 28555435a..66c553296 100644
--- a/tbx/people/migrations/0008_add_navigation_title_override.py
+++ b/tbx/people/migrations/0008_add_navigation_title_override.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0007_use_custom_streamfield"),
     ]
diff --git a/tbx/people/migrations/0009_add_earth_colour_theme.py b/tbx/people/migrations/0009_add_earth_colour_theme.py
index 7e0c066e8..6f4b84a1d 100644
--- a/tbx/people/migrations/0009_add_earth_colour_theme.py
+++ b/tbx/people/migrations/0009_add_earth_colour_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0008_add_navigation_title_override"),
     ]
diff --git a/tbx/people/migrations/0010_add_email_text_field_to_contact.py b/tbx/people/migrations/0010_add_email_text_field_to_contact.py
index 500f2e2ea..4b975e0ef 100644
--- a/tbx/people/migrations/0010_add_email_text_field_to_contact.py
+++ b/tbx/people/migrations/0010_add_email_text_field_to_contact.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0009_add_earth_colour_theme"),
     ]
diff --git a/tbx/people/models.py b/tbx/people/models.py
index cdd6e6099..68c91e468 100644
--- a/tbx/people/models.py
+++ b/tbx/people/models.py
@@ -10,6 +10,13 @@
 
 from modelcluster.fields import ParentalKey, ParentalManyToManyField
 from modelcluster.models import ClusterableModel
+from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Orderable, Page
+from wagtail.search import index
+from wagtail.signals import page_published
+from wagtail.snippets.models import register_snippet
+
 from tbx.core.utils.fields import StreamField
 from tbx.core.utils.models import (
     ColourThemeMixin,
@@ -20,12 +27,6 @@
 from tbx.people.blocks import ContactCTABlock
 from tbx.people.forms import ContactAdminForm
 from tbx.taxonomy.models import Team
-from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
-from wagtail.fields import RichTextField
-from wagtail.models import Orderable, Page
-from wagtail.search import index
-from wagtail.signals import page_published
-from wagtail.snippets.models import register_snippet
 
 
 @register_snippet
@@ -142,6 +143,9 @@ class ContactMixin(models.Model):
 
     promote_panels = [FieldPanel("contact")]
 
+    class Meta:
+        abstract = True
+
     @cached_property
     def footer_contact(self):
         """
@@ -165,9 +169,6 @@ def footer_contact(self):
         # (see `tbx.people.models.Contact.save()`)
         return Contact.objects.filter(default_contact=True).first()
 
-    class Meta:
-        abstract = True
-
 
 class PersonPage(ColourThemeMixin, ContactMixin, SocialFields, NavigationFields, Page):
     template = "patterns/pages/team/team_detail.html"
@@ -185,10 +186,6 @@ class PersonPage(ColourThemeMixin, ContactMixin, SocialFields, NavigationFields,
     )
     related_teams = ParentalManyToManyField("taxonomy.Team", related_name="people")
 
-    @cached_property
-    def teams(self):
-        return self.related_teams.all()
-
     search_fields = Page.search_fields + [
         index.SearchField("intro"),
         index.SearchField("biography"),
@@ -214,6 +211,13 @@ def teams(self):
         ]
     )
 
+    def __str__(self) -> str:
+        return self.title
+
+    @cached_property
+    def teams(self):
+        return self.related_teams.all()
+
     @cached_property
     def author_posts(self):
         # this import is added here in order to avoid circular imports
@@ -309,6 +313,25 @@ class PersonIndexPage(
 
     subpage_types = ["PersonPage"]
 
+    content_panels = Page.content_panels + [
+        FieldPanel("strapline"),
+    ]
+
+    promote_panels = (
+        [
+            MultiFieldPanel(Page.promote_panels, "Common page configuration"),
+        ]
+        + NavigationFields.promote_panels
+        + ColourThemeMixin.promote_panels
+        + ContactMixin.promote_panels
+        + [
+            MultiFieldPanel(SocialFields.promote_panels, "Social fields"),
+        ]
+    )
+
+    def __str__(self) -> str:
+        return self.title
+
     @cached_property
     def people(self):
         prefetch_images = models.Prefetch(
@@ -356,22 +379,6 @@ def get_context(self, request, *args, **kwargs):
         )
         return context
 
-    content_panels = Page.content_panels + [
-        FieldPanel("strapline"),
-    ]
-
-    promote_panels = (
-        [
-            MultiFieldPanel(Page.promote_panels, "Common page configuration"),
-        ]
-        + NavigationFields.promote_panels
-        + ColourThemeMixin.promote_panels
-        + ContactMixin.promote_panels
-        + [
-            MultiFieldPanel(SocialFields.promote_panels, "Social fields"),
-        ]
-    )
-
 
 # An author snippet which keeps a copy of a person's details in case they leave and their page is unpublished
 # Could also be used for external authors
@@ -395,6 +402,9 @@ class Author(index.Indexed, models.Model):
         related_name="+",
     )
 
+    def __str__(self) -> str:
+        return self.name
+
     def update_manual_fields(self, person_page):
         self.name = person_page.title
         self.role = person_page.role
@@ -409,9 +419,6 @@ def clean(self):
         if self.person_page:
             self.update_manual_fields(self.person_page)
 
-    def __str__(self):
-        return self.name
-
     search_fields = [
         index.AutocompleteField("name"),
         index.SearchField("name"),
diff --git a/tbx/people/tests/test_author.py b/tbx/people/tests/test_author.py
index 7c03cab42..a759d2654 100644
--- a/tbx/people/tests/test_author.py
+++ b/tbx/people/tests/test_author.py
@@ -1,9 +1,10 @@
 from django.test import TestCase
 
+from wagtail.models import Page, Site
+
 from tbx.core.factories import HomePageFactory
 from tbx.people.factories import PersonIndexPageFactory, PersonPageFactory
 from tbx.people.models import Author
-from wagtail.models import Page, Site
 
 
 class TestAuthor(TestCase):
diff --git a/tbx/people/tests/test_contact.py b/tbx/people/tests/test_contact.py
index 2c6b07894..484c8385a 100644
--- a/tbx/people/tests/test_contact.py
+++ b/tbx/people/tests/test_contact.py
@@ -1,5 +1,7 @@
 from django.test import TestCase
 
+from wagtail.models import Site
+
 from tbx.blog.factories import BlogIndexPageFactory, BlogPageFactory
 from tbx.core.factories import HomePageFactory, StandardPageFactory
 from tbx.people.factories import ContactFactory
@@ -9,7 +11,6 @@
     WorkIndexPageFactory,
     WorkPageFactory,
 )
-from wagtail.models import Site
 
 
 class TestContact(TestCase):
diff --git a/tbx/project_styleguide/templatetags/navigation_tags.py b/tbx/project_styleguide/templatetags/navigation_tags.py
index 5f269b0c0..89f1cc0de 100644
--- a/tbx/project_styleguide/templatetags/navigation_tags.py
+++ b/tbx/project_styleguide/templatetags/navigation_tags.py
@@ -1,6 +1,8 @@
 from pattern_library.monkey_utils import override_tag
+
 from tbx.navigation.templatetags.navigation_tags import register
 
+
 override_tag(register, name="primarynav", default_html="")
 override_tag(register, name="primarynavmobile", default_html="")
 override_tag(register, name="footerlinks", default_html="")
diff --git a/tbx/project_styleguide/templatetags/readingtimetags.py b/tbx/project_styleguide/templatetags/readingtimetags.py
index 1854a1dc0..813891a6a 100644
--- a/tbx/project_styleguide/templatetags/readingtimetags.py
+++ b/tbx/project_styleguide/templatetags/readingtimetags.py
@@ -1,4 +1,6 @@
 from pattern_library.monkey_utils import override_tag
+
 from tbx.core.templatetags.reading_time_tags import register
 
+
 override_tag(register, name="get_reading_time_minutes", default_html="")
diff --git a/tbx/project_styleguide/templatetags/wagtailcore_tags.py b/tbx/project_styleguide/templatetags/wagtailcore_tags.py
index 558f0ec9c..d4829f316 100644
--- a/tbx/project_styleguide/templatetags/wagtailcore_tags.py
+++ b/tbx/project_styleguide/templatetags/wagtailcore_tags.py
@@ -1,6 +1,8 @@
-from pattern_library.monkey_utils import override_tag
 from wagtail.templatetags.wagtailcore_tags import register
 
+from pattern_library.monkey_utils import override_tag
+
+
 override_tag(register, name="include_block", default_html="")
 override_tag(register, name="pageurl", default_html="/")
 override_tag(register, name="slugurl", default_html="")
diff --git a/tbx/project_styleguide/templatetags/wagtailimages_tags.py b/tbx/project_styleguide/templatetags/wagtailimages_tags.py
index 5deaa3357..886d40730 100644
--- a/tbx/project_styleguide/templatetags/wagtailimages_tags.py
+++ b/tbx/project_styleguide/templatetags/wagtailimages_tags.py
@@ -1,5 +1,7 @@
-from pattern_library.monkey_utils import override_tag
 from wagtail.images.templatetags.wagtailimages_tags import register
 
+from pattern_library.monkey_utils import override_tag
+
+
 override_tag(register, name="image", default_html="")
 override_tag(register, name="srcset_image", default_html="")
diff --git a/tbx/services/blocks.py b/tbx/services/blocks.py
index 82f47c280..f75fa4be1 100644
--- a/tbx/services/blocks.py
+++ b/tbx/services/blocks.py
@@ -1,3 +1,5 @@
+from wagtail import blocks
+
 from tbx.core.blocks import (
     BlogChooserBlock,
     CustomImageChooserBlock,
@@ -11,7 +13,6 @@
     TabbedParagraphBlock,
     WorkChooserBlock,
 )
-from wagtail import blocks
 
 
 class PartnersBlock(blocks.StructBlock):
diff --git a/tbx/services/migrations/0001_initial.py b/tbx/services/migrations/0001_initial.py
index 0fe53ec90..82be95439 100644
--- a/tbx/services/migrations/0001_initial.py
+++ b/tbx/services/migrations/0001_initial.py
@@ -2,17 +2,18 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
diff --git a/tbx/services/migrations/0002_alter_servicepage_body.py b/tbx/services/migrations/0002_alter_servicepage_body.py
index cff13d064..dadb89fac 100644
--- a/tbx/services/migrations/0002_alter_servicepage_body.py
+++ b/tbx/services/migrations/0002_alter_servicepage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-26 10:26
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0001_initial"),
     ]
diff --git a/tbx/services/migrations/0003_alter_servicepage_body.py b/tbx/services/migrations/0003_alter_servicepage_body.py
index f6270304e..02300e15a 100644
--- a/tbx/services/migrations/0003_alter_servicepage_body.py
+++ b/tbx/services/migrations/0003_alter_servicepage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-26 11:17
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0002_alter_servicepage_body"),
     ]
diff --git a/tbx/services/migrations/0004_servicepage_featured_blog_heading_and_more.py b/tbx/services/migrations/0004_servicepage_featured_blog_heading_and_more.py
index 3f41ce7e7..088a1353f 100644
--- a/tbx/services/migrations/0004_servicepage_featured_blog_heading_and_more.py
+++ b/tbx/services/migrations/0004_servicepage_featured_blog_heading_and_more.py
@@ -2,11 +2,11 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("wagtailcore", "0089_log_entry_data_json_null_to_object"),
         ("services", "0003_alter_servicepage_body"),
diff --git a/tbx/services/migrations/0005_add_featured_case_study_block.py b/tbx/services/migrations/0005_add_featured_case_study_block.py
index 5d7b1d744..5758d7c96 100644
--- a/tbx/services/migrations/0005_add_featured_case_study_block.py
+++ b/tbx/services/migrations/0005_add_featured_case_study_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-29 11:35
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0004_servicepage_featured_blog_heading_and_more"),
     ]
diff --git a/tbx/services/migrations/0006_move_blog_and_work_chooser_to_streamfields.py b/tbx/services/migrations/0006_move_blog_and_work_chooser_to_streamfields.py
index 3493b3847..e544bcc9a 100644
--- a/tbx/services/migrations/0006_move_blog_and_work_chooser_to_streamfields.py
+++ b/tbx/services/migrations/0006_move_blog_and_work_chooser_to_streamfields.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-01 16:39
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0005_add_featured_case_study_block"),
     ]
diff --git a/tbx/services/migrations/0007_servicepage_theme.py b/tbx/services/migrations/0007_servicepage_theme.py
index 8db6799cf..2d0e3a08a 100644
--- a/tbx/services/migrations/0007_servicepage_theme.py
+++ b/tbx/services/migrations/0007_servicepage_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0006_move_blog_and_work_chooser_to_streamfields"),
     ]
diff --git a/tbx/services/migrations/0008_add_contact_mixin_to_all_page_models.py b/tbx/services/migrations/0008_add_contact_mixin_to_all_page_models.py
index e36fb077a..ccc62d559 100644
--- a/tbx/services/migrations/0008_add_contact_mixin_to_all_page_models.py
+++ b/tbx/services/migrations/0008_add_contact_mixin_to_all_page_models.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0006_add_contact_mixin_to_all_page_models"),
         ("services", "0007_servicepage_theme"),
diff --git a/tbx/services/migrations/0009_alter_servicepage_body.py b/tbx/services/migrations/0009_alter_servicepage_body.py
index 473d21d5f..a7f0a254f 100644
--- a/tbx/services/migrations/0009_alter_servicepage_body.py
+++ b/tbx/services/migrations/0009_alter_servicepage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-26 09:50
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0008_add_contact_mixin_to_all_page_models"),
     ]
diff --git a/tbx/services/migrations/0010_alter_servicepage_body.py b/tbx/services/migrations/0010_alter_servicepage_body.py
index 0f4dccb2a..6b6aa56b3 100644
--- a/tbx/services/migrations/0010_alter_servicepage_body.py
+++ b/tbx/services/migrations/0010_alter_servicepage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-26 10:45
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0009_alter_servicepage_body"),
     ]
diff --git a/tbx/services/migrations/0011_update_label_names.py b/tbx/services/migrations/0011_update_label_names.py
index 191a6cf85..6f19aaa56 100644
--- a/tbx/services/migrations/0011_update_label_names.py
+++ b/tbx/services/migrations/0011_update_label_names.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-26 16:31
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0010_alter_servicepage_body"),
     ]
diff --git a/tbx/services/migrations/0012_add_promo_block_to_servicepage_body.py b/tbx/services/migrations/0012_add_promo_block_to_servicepage_body.py
index db355953b..263603ee7 100644
--- a/tbx/services/migrations/0012_add_promo_block_to_servicepage_body.py
+++ b/tbx/services/migrations/0012_add_promo_block_to_servicepage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-27 10:25
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0011_update_label_names"),
     ]
diff --git a/tbx/services/migrations/0013_add_wide_image_block.py b/tbx/services/migrations/0013_add_wide_image_block.py
index 6c2b7a7a0..f5bea2167 100644
--- a/tbx/services/migrations/0013_add_wide_image_block.py
+++ b/tbx/services/migrations/0013_add_wide_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-27 14:14
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0012_add_promo_block_to_servicepage_body"),
     ]
diff --git a/tbx/services/migrations/0014_add_wide_image_block.py b/tbx/services/migrations/0014_add_wide_image_block.py
index fa081a046..98ed6dff9 100644
--- a/tbx/services/migrations/0014_add_wide_image_block.py
+++ b/tbx/services/migrations/0014_add_wide_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-28 08:44
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0013_add_wide_image_block"),
     ]
diff --git a/tbx/services/migrations/0015_add_tabbed_paragraph_block.py b/tbx/services/migrations/0015_add_tabbed_paragraph_block.py
index 1cda0e50e..bf54925d8 100644
--- a/tbx/services/migrations/0015_add_tabbed_paragraph_block.py
+++ b/tbx/services/migrations/0015_add_tabbed_paragraph_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-29 08:09
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0014_add_wide_image_block"),
     ]
diff --git a/tbx/services/migrations/0016_add_event_block_to_servicepage_body.py b/tbx/services/migrations/0016_add_event_block_to_servicepage_body.py
index 866c042a6..bee9f517a 100644
--- a/tbx/services/migrations/0016_add_event_block_to_servicepage_body.py
+++ b/tbx/services/migrations/0016_add_event_block_to_servicepage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-02-29 09:01
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0015_add_tabbed_paragraph_block"),
     ]
diff --git a/tbx/services/migrations/0017_add_values_block.py b/tbx/services/migrations/0017_add_values_block.py
index 8c934d1e7..25f4f16d4 100644
--- a/tbx/services/migrations/0017_add_values_block.py
+++ b/tbx/services/migrations/0017_add_values_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-03-05 09:08
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0016_add_event_block_to_servicepage_body"),
     ]
diff --git a/tbx/services/migrations/0018_update_button_link_on_photocollageblock.py b/tbx/services/migrations/0018_update_button_link_on_photocollageblock.py
index 2c7b76b0e..34054b9f4 100644
--- a/tbx/services/migrations/0018_update_button_link_on_photocollageblock.py
+++ b/tbx/services/migrations/0018_update_button_link_on_photocollageblock.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-03-07 11:56
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0017_add_values_block"),
     ]
diff --git a/tbx/services/migrations/0019_remove_featured_case_study_tagline.py b/tbx/services/migrations/0019_remove_featured_case_study_tagline.py
index 9a30b02d6..3e0bff1ef 100644
--- a/tbx/services/migrations/0019_remove_featured_case_study_tagline.py
+++ b/tbx/services/migrations/0019_remove_featured_case_study_tagline.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-03-11 12:55
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0018_update_button_link_on_photocollageblock"),
     ]
diff --git a/tbx/services/migrations/0019_use_custom_streamfield.py b/tbx/services/migrations/0019_use_custom_streamfield.py
index c6e4c846f..24abb5e44 100644
--- a/tbx/services/migrations/0019_use_custom_streamfield.py
+++ b/tbx/services/migrations/0019_use_custom_streamfield.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-11 19:43
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0018_update_button_link_on_photocollageblock"),
     ]
diff --git a/tbx/services/migrations/0020_merge_20240315_1052.py b/tbx/services/migrations/0020_merge_20240315_1052.py
index 3a4382d05..236045ca8 100644
--- a/tbx/services/migrations/0020_merge_20240315_1052.py
+++ b/tbx/services/migrations/0020_merge_20240315_1052.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-15 10:52
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0019_remove_featured_case_study_tagline"),
         ("services", "0019_use_custom_streamfield"),
diff --git a/tbx/services/migrations/0021_add_navigation_title_override.py b/tbx/services/migrations/0021_add_navigation_title_override.py
index 5e05be12a..d7a9f540f 100644
--- a/tbx/services/migrations/0021_add_navigation_title_override.py
+++ b/tbx/services/migrations/0021_add_navigation_title_override.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0020_merge_20240315_1052"),
     ]
diff --git a/tbx/services/migrations/0022_add_earth_colour_theme.py b/tbx/services/migrations/0022_add_earth_colour_theme.py
index 2e5b590b0..3c5627bb1 100644
--- a/tbx/services/migrations/0022_add_earth_colour_theme.py
+++ b/tbx/services/migrations/0022_add_earth_colour_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("services", "0021_add_navigation_title_override"),
     ]
diff --git a/tbx/services/models.py b/tbx/services/models.py
index 254d56a32..ea9185dce 100644
--- a/tbx/services/models.py
+++ b/tbx/services/models.py
@@ -1,3 +1,8 @@
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Page
+from wagtail.search import index
+
 from tbx.core.utils.fields import StreamField
 from tbx.core.utils.models import (
     ColourThemeMixin,
@@ -5,10 +10,6 @@
     SocialFields,
 )
 from tbx.people.models import ContactMixin
-from wagtail.admin.panels import FieldPanel, MultiFieldPanel
-from wagtail.fields import RichTextField
-from wagtail.models import Page
-from wagtail.search import index
 
 from .blocks import ServiceStoryBlock
 
diff --git a/tbx/settings/base.py b/tbx/settings/base.py
index 942bde4ba..216224ab5 100644
--- a/tbx/settings/base.py
+++ b/tbx/settings/base.py
@@ -1,4 +1,5 @@
 # Django settings for tbx project.
+import contextlib
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
@@ -6,6 +7,7 @@
 
 import dj_database_url
 
+
 # Configuration from environment variables
 env = os.environ.copy()
 
@@ -333,10 +335,8 @@
     EMAIL_HOST = env["EMAIL_HOST"]
 
 if "EMAIL_PORT" in env:
-    try:
+    with contextlib.suppress(ValueError):
         EMAIL_PORT = int(env["EMAIL_PORT"])
-    except ValueError:
-        pass
 
 if "EMAIL_HOST_USER" in env:
     EMAIL_HOST_USER = env["EMAIL_HOST_USER"]
@@ -410,10 +410,8 @@
 DEFAULT_HSTS_SECONDS = 30 * 24 * 60 * 60  # 30 days
 SECURE_HSTS_SECONDS = DEFAULT_HSTS_SECONDS
 if "SECURE_HSTS_SECONDS" in env:
-    try:
+    with contextlib.suppress(ValueError):
         SECURE_HSTS_SECONDS = int(env["SECURE_HSTS_SECONDS"])
-    except ValueError:
-        pass
 
 # We don't enforce HSTS on subdomains as anything at subdomains is likely outside our control.
 # https://docs.djangoproject.com/en/3.2/ref/settings/#secure-hsts-include-subdomains
@@ -547,10 +545,8 @@
 
 # Set s-max-age header that is used by reverse proxy/front end cache. See
 # urls.py
-try:
+with contextlib.suppress(ValueError):
     CACHE_CONTROL_S_MAXAGE = int(env.get("CACHE_CONTROL_S_MAXAGE", 600))
-except ValueError:
-    pass
 
 
 # Give front-end cache 30 second to revalidate the cache to avoid hitting the
@@ -593,7 +589,8 @@
 
 
 WAGTAIL_PASSWORD_REQUIRED_TEMPLATE = (
-    "patterns/pages/wagtail/password_required.html"  # pragma: allowlist secret
+    # pragma: allowlist nextline secret
+    "patterns/pages/wagtail/password_required.html"  # noqa: S105
 )
 # Styleguide
 PATTERN_LIBRARY_ENABLED = env.get("PATTERN_LIBRARY_ENABLED", "false").lower() == "true"
diff --git a/tbx/settings/dev.py b/tbx/settings/dev.py
index 77575d922..cebf560f2 100644
--- a/tbx/settings/dev.py
+++ b/tbx/settings/dev.py
@@ -1,11 +1,15 @@
-from .base import *  # noqa
+import contextlib
+
+from .base import *  # noqa: F403
+
 
 DEBUG = True
 
 SECURE_SSL_REDIRECT = False
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "CHANGEME!!!"  # pragma: allowlist secret
+# pragma: allowlist nextline secret
+SECRET_KEY = "CHANGEME!!!"  # noqa: S105
 
 # Enable FE component library
 PATTERN_LIBRARY_ENABLED = True
@@ -25,7 +29,7 @@
 
 # Enable Wagtail's style guide in Wagtail's settings menu.
 # http://docs.wagtail.io/en/stable/contributing/styleguide.html
-INSTALLED_APPS += ["wagtail.contrib.styleguide"]  # noqa
+INSTALLED_APPS += ["wagtail.contrib.styleguide"]  # noqa: F405
 
 # Set URL for the preview iframe. Should point at Gatsby.
 PREVIEW_URL = "http://localhost:8003/preview/"
@@ -33,8 +37,8 @@
 MEDIA_PREFIX = WAGTAILADMIN_BASE_URL
 
 # Adds Django Debug Toolbar
-INSTALLED_APPS.append("debug_toolbar")  # noqa
-MIDDLEWARE.insert(0, "debug_toolbar.middleware.DebugToolbarMiddleware")  # noqa
+INSTALLED_APPS.append("debug_toolbar")
+MIDDLEWARE.insert(0, "debug_toolbar.middleware.DebugToolbarMiddleware")  # noqa: F405
 
 # Override in `local.py`
 SHOW_TOOLBAR = True
@@ -48,9 +52,7 @@
 }
 
 # Django extensions
-INSTALLED_APPS.append("django_extensions")  # noqa
+INSTALLED_APPS.append("django_extensions")
 
-try:
-    from .local import *  # noqa
-except ImportError:
-    pass
+with contextlib.suppress(ImportError):
+    from .local import *  # noqa: F403
diff --git a/tbx/settings/production.py b/tbx/settings/production.py
index 579de733c..32b4ac884 100644
--- a/tbx/settings/production.py
+++ b/tbx/settings/production.py
@@ -1,4 +1,7 @@
-from .base import *  # noqa
+import contextlib
+
+from .base import *  # noqa: F403
+
 
 # Disable debug mode
 DEBUG = False
@@ -6,7 +9,5 @@
 # Error if there aren't enough proxies in between
 XFF_ALWAYS_PROXY = True
 
-try:
-    from .local import *  # noqa
-except ImportError:
-    pass
+with contextlib.suppress(ImportError):
+    from .local import *  # noqa: F403
diff --git a/tbx/settings/test.py b/tbx/settings/test.py
index 5c2232080..7e6489e6e 100644
--- a/tbx/settings/test.py
+++ b/tbx/settings/test.py
@@ -1,10 +1,12 @@
-from .base import *  # noqa
+from .base import *  # noqa: F403
+
 
 # #############
 # General
 
 # SECRET_KEY is required by Django to start.
-SECRET_KEY = "fake_secret_key_to_run_tests"  # pragma: allowlist secret
+# pragma: allowlist nextline secret
+SECRET_KEY = "fake_secret_key_to_run_tests"  # noqa: S105
 
 # Don't redirect to HTTPS in tests.
 SECURE_SSL_REDIRECT = False
diff --git a/tbx/taxonomy/factories.py b/tbx/taxonomy/factories.py
index c6bca0f0d..d95fd6a7f 100644
--- a/tbx/taxonomy/factories.py
+++ b/tbx/taxonomy/factories.py
@@ -2,6 +2,7 @@
 
 import factory
 from factory.django import DjangoModelFactory
+
 from tbx.taxonomy.models import Sector, Service, Team
 
 
diff --git a/tbx/taxonomy/migrations/0001_initial.py b/tbx/taxonomy/migrations/0001_initial.py
index 589205e72..2fd39e130 100644
--- a/tbx/taxonomy/migrations/0001_initial.py
+++ b/tbx/taxonomy/migrations/0001_initial.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
diff --git a/tbx/taxonomy/migrations/0002_sector_team_remove_service_contact_reasons_and_more.py b/tbx/taxonomy/migrations/0002_sector_team_remove_service_contact_reasons_and_more.py
index 075ecd2d5..6d171f540 100644
--- a/tbx/taxonomy/migrations/0002_sector_team_remove_service_contact_reasons_and_more.py
+++ b/tbx/taxonomy/migrations/0002_sector_team_remove_service_contact_reasons_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taxonomy", "0001_initial"),
     ]
diff --git a/tbx/taxonomy/models.py b/tbx/taxonomy/models.py
index a008a0eea..41d39d293 100644
--- a/tbx/taxonomy/models.py
+++ b/tbx/taxonomy/models.py
@@ -9,13 +9,13 @@ class BaseTaxonomy(models.Model):
     description = models.TextField(blank=True)
     sort_order = models.IntegerField()
 
-    def __str__(self):
-        return self.name
-
     class Meta:
         ordering = ["sort_order"]
         abstract = True
 
+    def __str__(self) -> str:
+        return self.name
+
     panels = [
         TitleFieldPanel("name"),
         FieldPanel("slug"),
@@ -30,8 +30,6 @@ class Service(BaseTaxonomy):
     This will be assigned to blog posts and work articles, and users will be able to filter by service
     """
 
-    pass
-
 
 class Sector(BaseTaxonomy):
     """Represents a sector that Torchbox works in
@@ -39,13 +37,9 @@ class Sector(BaseTaxonomy):
     This will be assigned to blog posts and work articles, and users will be able to filter by sector
     """
 
-    pass
-
 
 class Team(BaseTaxonomy):
     """Represents each team that makes up Torchbox
 
     A person may be assigned to one or more teams. Teams are used to filter the team listing page
     """
-
-    pass
diff --git a/tbx/taxonomy/tests/test_models.py b/tbx/taxonomy/tests/test_models.py
index 998bacf47..f21f6526e 100644
--- a/tbx/taxonomy/tests/test_models.py
+++ b/tbx/taxonomy/tests/test_models.py
@@ -1,10 +1,13 @@
+from wagtail.models import Site
+from wagtail.test.utils import WagtailPageTestCase
+
 from faker import Faker
+
 from tbx.blog.factories import BlogIndexPageFactory, BlogPageFactory
 from tbx.core.factories import HomePageFactory
 from tbx.taxonomy.factories import SectorFactory, ServiceFactory
 from tbx.taxonomy.models import Sector, Service
-from wagtail.models import Site
-from wagtail.test.utils import WagtailPageTestCase
+
 
 fake = Faker(["en_GB"])
 
diff --git a/tbx/taxonomy/wagtail_hooks.py b/tbx/taxonomy/wagtail_hooks.py
index 09f79024f..4e4c5e96e 100644
--- a/tbx/taxonomy/wagtail_hooks.py
+++ b/tbx/taxonomy/wagtail_hooks.py
@@ -2,4 +2,5 @@
 
 from .admin import TaxonomyModelAdminGroup
 
+
 register_snippet(TaxonomyModelAdminGroup)
diff --git a/tbx/urls.py b/tbx/urls.py
index 392327a49..c75bedc01 100644
--- a/tbx/urls.py
+++ b/tbx/urls.py
@@ -5,12 +5,6 @@
 from django.views.decorators.cache import never_cache
 from django.views.decorators.vary import vary_on_headers
 
-from tbx.core import urls as torchbox_urls
-from tbx.core.utils.cache import (
-    get_default_cache_control_decorator,
-    get_default_cache_control_method_decorator,
-)
-from tbx.core.views import robots, switch_mode
 from wagtail import urls as wagtail_urls
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.contrib.sitemaps.views import sitemap
@@ -18,6 +12,14 @@
 from wagtail.models import Page
 from wagtail.utils.urlpatterns import decorate_urlpatterns
 
+from tbx.core import urls as torchbox_urls
+from tbx.core.utils.cache import (
+    get_default_cache_control_decorator,
+    get_default_cache_control_method_decorator,
+)
+from tbx.core.views import robots, switch_mode
+
+
 private_urlpatterns = [
     path("django-admin/", admin.site.urls),
     path("admin/", include(wagtailadmin_urls)),
diff --git a/tbx/users/admin.py b/tbx/users/admin.py
index 6d53b53a7..7dd7477dd 100644
--- a/tbx/users/admin.py
+++ b/tbx/users/admin.py
@@ -3,4 +3,5 @@
 
 from .models import User
 
+
 admin.site.register(User, UserAdmin)
diff --git a/tbx/users/migrations/0001_initial.py b/tbx/users/migrations/0001_initial.py
index 1d729ca59..10cdbf180 100644
--- a/tbx/users/migrations/0001_initial.py
+++ b/tbx/users/migrations/0001_initial.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
diff --git a/tbx/work/blocks.py b/tbx/work/blocks.py
index 99aaa8b9b..0a6c4d7bb 100644
--- a/tbx/work/blocks.py
+++ b/tbx/work/blocks.py
@@ -1,9 +1,10 @@
+from wagtail import blocks
+
 from tbx.core.blocks import (
     NumericStatisticsBlock,
     StoryBlock,
     TextualStatisticsBlock,
 )
-from wagtail import blocks
 
 
 class WorkSectionContent(StoryBlock):
diff --git a/tbx/work/factories.py b/tbx/work/factories.py
index a98711518..793454515 100644
--- a/tbx/work/factories.py
+++ b/tbx/work/factories.py
@@ -1,5 +1,6 @@
 import factory
 import wagtail_factories
+
 from tbx.core.factories import StoryBlockFactory
 from tbx.images.factories import CustomImageFactory
 from tbx.taxonomy.factories import ServiceFactory
diff --git a/tbx/work/migrations/0001_initial.py b/tbx/work/migrations/0001_initial.py
index a59754adb..9b95fbcb3 100644
--- a/tbx/work/migrations/0001_initial.py
+++ b/tbx/work/migrations/0001_initial.py
@@ -2,18 +2,20 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
-import tbx.core.blocks
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
diff --git a/tbx/work/migrations/0002_remove_workindexpage_call_to_action_and_more.py b/tbx/work/migrations/0002_remove_workindexpage_call_to_action_and_more.py
index f95199444..dd2505b0e 100644
--- a/tbx/work/migrations/0002_remove_workindexpage_call_to_action_and_more.py
+++ b/tbx/work/migrations/0002_remove_workindexpage_call_to_action_and_more.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.9 on 2024-01-15 10:19
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("work", "0001_initial"),
     ]
diff --git a/tbx/work/migrations/0003_add_new_image_block_to_body_streamfield.py b/tbx/work/migrations/0003_add_new_image_block_to_body_streamfield.py
index 51f8f161f..2197d3bcf 100644
--- a/tbx/work/migrations/0003_add_new_image_block_to_body_streamfield.py
+++ b/tbx/work/migrations/0003_add_new_image_block_to_body_streamfield.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:14
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0002_remove_workindexpage_call_to_action_and_more"),
     ]
diff --git a/tbx/work/migrations/0003_alter_workpage_body.py b/tbx/work/migrations/0003_alter_workpage_body.py
index 90ad5b110..a8a6a367f 100644
--- a/tbx/work/migrations/0003_alter_workpage_body.py
+++ b/tbx/work/migrations/0003_alter_workpage_body.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.9 on 2024-01-15 12:35
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("work", "0002_remove_workindexpage_call_to_action_and_more"),
     ]
diff --git a/tbx/work/migrations/0004_alter_workpage_body.py b/tbx/work/migrations/0004_alter_workpage_body.py
index accd9546b..33380824e 100644
--- a/tbx/work/migrations/0004_alter_workpage_body.py
+++ b/tbx/work/migrations/0004_alter_workpage_body.py
@@ -1,17 +1,19 @@
 # Generated by Django 4.2.9 on 2024-01-16 13:44
 
 from django.db import migrations
-import tbx.core.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.core.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("work", "0003_alter_workpage_body"),
     ]
diff --git a/tbx/work/migrations/0004_data_migration_aligned_and_wide_images.py b/tbx/work/migrations/0004_data_migration_aligned_and_wide_images.py
index 749e9ba77..8f61065aa 100644
--- a/tbx/work/migrations/0004_data_migration_aligned_and_wide_images.py
+++ b/tbx/work/migrations/0004_data_migration_aligned_and_wide_images.py
@@ -1,6 +1,7 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:15
 
 from django.db import migrations
+
 from wagtail.blocks.migrations.migrate_operation import MigrateStreamData
 from wagtail.blocks.migrations.operations import RenameStreamChildrenOperation
 
diff --git a/tbx/work/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py b/tbx/work/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
index 86cb75c20..736e5803f 100644
--- a/tbx/work/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
+++ b/tbx/work/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-15 11:53
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0004_data_migration_aligned_and_wide_images"),
     ]
diff --git a/tbx/work/migrations/0006_merge_20240117_1530.py b/tbx/work/migrations/0006_merge_20240117_1530.py
index 045bf11ee..0bbdb76b6 100644
--- a/tbx/work/migrations/0006_merge_20240117_1530.py
+++ b/tbx/work/migrations/0006_merge_20240117_1530.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0004_alter_workpage_body"),
         ("work", "0005_remove_aligned_and_wide_image_blocks_from_body_streamfield"),
diff --git a/tbx/work/migrations/0007_alter_workpage_body.py b/tbx/work/migrations/0007_alter_workpage_body.py
index 6c3bd4b8b..986b0e79e 100644
--- a/tbx/work/migrations/0007_alter_workpage_body.py
+++ b/tbx/work/migrations/0007_alter_workpage_body.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-17 15:31
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0006_merge_20240117_1530"),
     ]
diff --git a/tbx/work/migrations/0008_alter_workpage_body.py b/tbx/work/migrations/0008_alter_workpage_body.py
index f3fe93e5c..f14583c93 100644
--- a/tbx/work/migrations/0008_alter_workpage_body.py
+++ b/tbx/work/migrations/0008_alter_workpage_body.py
@@ -1,16 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-18 13:49
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0007_alter_workpage_body"),
     ]
diff --git a/tbx/work/migrations/0009_alter_workpage_body.py b/tbx/work/migrations/0009_alter_workpage_body.py
index 70fb07881..edcf84d0e 100644
--- a/tbx/work/migrations/0009_alter_workpage_body.py
+++ b/tbx/work/migrations/0009_alter_workpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-18 14:11
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0008_alter_workpage_body"),
     ]
diff --git a/tbx/work/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py b/tbx/work/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py
index a6f34c5e0..6d1d05c1b 100644
--- a/tbx/work/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py
+++ b/tbx/work/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-19 13:09
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0009_alter_workpage_body"),
     ]
diff --git a/tbx/work/migrations/0011_alter_workpage_body.py b/tbx/work/migrations/0011_alter_workpage_body.py
index 4fd2f7766..095e111a5 100644
--- a/tbx/work/migrations/0011_alter_workpage_body.py
+++ b/tbx/work/migrations/0011_alter_workpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-24 10:12
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0010_add_help_text_to_alt_text_field_in_image_block"),
     ]
diff --git a/tbx/work/migrations/0011_rename_workpage_historicalworkpage_and_more.py b/tbx/work/migrations/0011_rename_workpage_historicalworkpage_and_more.py
index 235f99ea4..474ac8ef7 100644
--- a/tbx/work/migrations/0011_rename_workpage_historicalworkpage_and_more.py
+++ b/tbx/work/migrations/0011_rename_workpage_historicalworkpage_and_more.py
@@ -1,8 +1,9 @@
 # Generated by Django 4.2.9 on 2024-01-25 08:49
 
+from django.db import migrations
 import django.db.models.deletion
+
 import modelcluster.fields
-from django.db import migrations
 
 
 class Migration(migrations.Migration):
diff --git a/tbx/work/migrations/0013_delete_workpageauthor.py b/tbx/work/migrations/0013_delete_workpageauthor.py
index 18c0f1605..d4b599328 100644
--- a/tbx/work/migrations/0013_delete_workpageauthor.py
+++ b/tbx/work/migrations/0013_delete_workpageauthor.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0012_data_migration_page_author"),
     ]
diff --git a/tbx/work/migrations/0014_add_new_workpage_model.py b/tbx/work/migrations/0014_add_new_workpage_model.py
index a3a98718d..34f86b0af 100644
--- a/tbx/work/migrations/0014_add_new_workpage_model.py
+++ b/tbx/work/migrations/0014_add_new_workpage_model.py
@@ -1,15 +1,17 @@
 # Generated by Django 4.2.9 on 2024-01-26 07:28
 
+from django.db import migrations, models
 import django.db.models.deletion
+
 import modelcluster.fields
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
-from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/tbx/work/migrations/0015_merge_20240126_0816.py b/tbx/work/migrations/0015_merge_20240126_0816.py
index 7e61f6fd2..d61f8619c 100644
--- a/tbx/work/migrations/0015_merge_20240126_0816.py
+++ b/tbx/work/migrations/0015_merge_20240126_0816.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0011_alter_workpage_body"),
         ("work", "0014_add_new_workpage_model"),
diff --git a/tbx/work/migrations/0016_alter_historicalworkpage_body_alter_workpage_body.py b/tbx/work/migrations/0016_alter_historicalworkpage_body_alter_workpage_body.py
index efc57177b..befe717e4 100644
--- a/tbx/work/migrations/0016_alter_historicalworkpage_body_alter_workpage_body.py
+++ b/tbx/work/migrations/0016_alter_historicalworkpage_body_alter_workpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-26 08:20
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0015_merge_20240126_0816"),
     ]
diff --git a/tbx/work/migrations/0017_alter_historicalworkpage_body_alter_workpage_body.py b/tbx/work/migrations/0017_alter_historicalworkpage_body_alter_workpage_body.py
index 42346aa24..bb9ca206b 100644
--- a/tbx/work/migrations/0017_alter_historicalworkpage_body_alter_workpage_body.py
+++ b/tbx/work/migrations/0017_alter_historicalworkpage_body_alter_workpage_body.py
@@ -1,17 +1,18 @@
 # Generated by Django 4.2.9 on 2024-01-26 10:39
 
 from django.db import migrations
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0016_alter_historicalworkpage_body_alter_workpage_body"),
     ]
diff --git a/tbx/work/migrations/0018_add_stats_blocks.py b/tbx/work/migrations/0018_add_stats_blocks.py
index a7d67f086..020593799 100644
--- a/tbx/work/migrations/0018_add_stats_blocks.py
+++ b/tbx/work/migrations/0018_add_stats_blocks.py
@@ -1,18 +1,20 @@
 # Generated by Django 4.2.9 on 2024-01-29 09:06
 
 from django.db import migrations
-import tbx.work.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.work.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("work", "0017_alter_historicalworkpage_body_alter_workpage_body"),
     ]
diff --git a/tbx/work/migrations/0019_work_page_changes.py b/tbx/work/migrations/0019_work_page_changes.py
index e5dd74522..e6b7675ff 100644
--- a/tbx/work/migrations/0019_work_page_changes.py
+++ b/tbx/work/migrations/0019_work_page_changes.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("images", "0001_initial"),
         ("work", "0018_add_stats_blocks"),
diff --git a/tbx/work/migrations/0020_remove_workindexpage_intro.py b/tbx/work/migrations/0020_remove_workindexpage_intro.py
index 747df6b53..4431ed45e 100644
--- a/tbx/work/migrations/0020_remove_workindexpage_intro.py
+++ b/tbx/work/migrations/0020_remove_workindexpage_intro.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0019_work_page_changes"),
     ]
diff --git a/tbx/work/migrations/0021_historicalworkpage_theme_workindexpage_theme_and_more.py b/tbx/work/migrations/0021_historicalworkpage_theme_workindexpage_theme_and_more.py
index 386349600..746af5b28 100644
--- a/tbx/work/migrations/0021_historicalworkpage_theme_workindexpage_theme_and_more.py
+++ b/tbx/work/migrations/0021_historicalworkpage_theme_workindexpage_theme_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0020_remove_workindexpage_intro"),
     ]
diff --git a/tbx/work/migrations/0022_historicalworkpage_related_sectors_and_more.py b/tbx/work/migrations/0022_historicalworkpage_related_sectors_and_more.py
index 9d34da971..c52215f29 100644
--- a/tbx/work/migrations/0022_historicalworkpage_related_sectors_and_more.py
+++ b/tbx/work/migrations/0022_historicalworkpage_related_sectors_and_more.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-02-06 10:56
 
 from django.db import migrations
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"),
         ("work", "0021_historicalworkpage_theme_workindexpage_theme_and_more"),
diff --git a/tbx/work/migrations/0023_add_contact_mixin_to_all_page_models.py b/tbx/work/migrations/0023_add_contact_mixin_to_all_page_models.py
index 255a42d09..d283a87ad 100644
--- a/tbx/work/migrations/0023_add_contact_mixin_to_all_page_models.py
+++ b/tbx/work/migrations/0023_add_contact_mixin_to_all_page_models.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("people", "0006_add_contact_mixin_to_all_page_models"),
         ("work", "0022_historicalworkpage_related_sectors_and_more"),
diff --git a/tbx/work/migrations/0024_alter_historicalworkpage_related_sectors_and_more.py b/tbx/work/migrations/0024_alter_historicalworkpage_related_sectors_and_more.py
index 750ec14a1..f5e5e2cb2 100644
--- a/tbx/work/migrations/0024_alter_historicalworkpage_related_sectors_and_more.py
+++ b/tbx/work/migrations/0024_alter_historicalworkpage_related_sectors_and_more.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-02-19 14:46
 
 from django.db import migrations
+
 import modelcluster.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"),
         ("work", "0023_add_contact_mixin_to_all_page_models"),
diff --git a/tbx/work/migrations/0025_alter_historicalworkpage_body_alter_workpage_body.py b/tbx/work/migrations/0025_alter_historicalworkpage_body_alter_workpage_body.py
index b54a9fb48..78a54f79f 100644
--- a/tbx/work/migrations/0025_alter_historicalworkpage_body_alter_workpage_body.py
+++ b/tbx/work/migrations/0025_alter_historicalworkpage_body_alter_workpage_body.py
@@ -1,18 +1,20 @@
 # Generated by Django 4.2.9 on 2024-02-26 09:50
 
 from django.db import migrations
-import tbx.work.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.work.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("work", "0024_alter_historicalworkpage_related_sectors_and_more"),
     ]
diff --git a/tbx/work/migrations/0026_add_wide_image_block.py b/tbx/work/migrations/0026_add_wide_image_block.py
index 027d61a93..1858a23d2 100644
--- a/tbx/work/migrations/0026_add_wide_image_block.py
+++ b/tbx/work/migrations/0026_add_wide_image_block.py
@@ -1,18 +1,20 @@
 # Generated by Django 4.2.9 on 2024-02-27 14:14
 
 from django.db import migrations
-import tbx.work.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.work.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("work", "0025_alter_historicalworkpage_body_alter_workpage_body"),
     ]
diff --git a/tbx/work/migrations/0027_add_wide_image_block.py b/tbx/work/migrations/0027_add_wide_image_block.py
index d3ce40d2c..15818ce64 100644
--- a/tbx/work/migrations/0027_add_wide_image_block.py
+++ b/tbx/work/migrations/0027_add_wide_image_block.py
@@ -1,18 +1,20 @@
 # Generated by Django 4.2.9 on 2024-02-28 08:44
 
 from django.db import migrations
-import tbx.work.blocks
+
 import wagtail.blocks
 import wagtail.embeds.blocks
 import wagtail.fields
 import wagtail.images.blocks
 import wagtail.snippets.blocks
+
 import wagtailmarkdown.blocks
 import wagtailmedia.blocks
 
+import tbx.work.blocks
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("work", "0026_add_wide_image_block"),
     ]
diff --git a/tbx/work/migrations/0028_remove_homepage_image_and_screenshot_fields.py b/tbx/work/migrations/0028_remove_homepage_image_and_screenshot_fields.py
index e629dfa0a..78a68c111 100644
--- a/tbx/work/migrations/0028_remove_homepage_image_and_screenshot_fields.py
+++ b/tbx/work/migrations/0028_remove_homepage_image_and_screenshot_fields.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0027_add_wide_image_block"),
     ]
diff --git a/tbx/work/migrations/0029_use_custom_streamfield.py b/tbx/work/migrations/0029_use_custom_streamfield.py
index 46c364be8..19e700041 100644
--- a/tbx/work/migrations/0029_use_custom_streamfield.py
+++ b/tbx/work/migrations/0029_use_custom_streamfield.py
@@ -1,11 +1,11 @@
 # Generated by Django 4.2.9 on 2024-03-11 19:43
 
 from django.db import migrations
+
 import tbx.core.utils.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0028_remove_homepage_image_and_screenshot_fields"),
     ]
diff --git a/tbx/work/migrations/0030_workpage_remove_desaturation_on_header_image.py b/tbx/work/migrations/0030_workpage_remove_desaturation_on_header_image.py
index 52e3e8cbc..5366ac7ce 100644
--- a/tbx/work/migrations/0030_workpage_remove_desaturation_on_header_image.py
+++ b/tbx/work/migrations/0030_workpage_remove_desaturation_on_header_image.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0029_use_custom_streamfield"),
     ]
diff --git a/tbx/work/migrations/0031_rename_feed_image_historicalworkpage_header_image.py b/tbx/work/migrations/0031_rename_feed_image_historicalworkpage_header_image.py
index 93e41ec27..7a49f1cb3 100644
--- a/tbx/work/migrations/0031_rename_feed_image_historicalworkpage_header_image.py
+++ b/tbx/work/migrations/0031_rename_feed_image_historicalworkpage_header_image.py
@@ -1,7 +1,7 @@
 # Manual combination of migrations generated by Django 4.2.9 on 2024-03-18
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
diff --git a/tbx/work/migrations/0032_remove_workpage_remove_desaturation_on_header_image.py b/tbx/work/migrations/0032_remove_workpage_remove_desaturation_on_header_image.py
index ea1fc904e..4ef668b3c 100644
--- a/tbx/work/migrations/0032_remove_workpage_remove_desaturation_on_header_image.py
+++ b/tbx/work/migrations/0032_remove_workpage_remove_desaturation_on_header_image.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0031_rename_feed_image_historicalworkpage_header_image"),
     ]
diff --git a/tbx/work/migrations/0033_add_navigation_title_override.py b/tbx/work/migrations/0033_add_navigation_title_override.py
index 8e7fa3a7e..1d3eda9c3 100644
--- a/tbx/work/migrations/0033_add_navigation_title_override.py
+++ b/tbx/work/migrations/0033_add_navigation_title_override.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0032_remove_workpage_remove_desaturation_on_header_image"),
     ]
diff --git a/tbx/work/migrations/0034_add_earth_colour_theme.py b/tbx/work/migrations/0034_add_earth_colour_theme.py
index de80d207a..1cff8065e 100644
--- a/tbx/work/migrations/0034_add_earth_colour_theme.py
+++ b/tbx/work/migrations/0034_add_earth_colour_theme.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0033_add_navigation_title_override"),
     ]
diff --git a/tbx/work/migrations/0035_add_alt_text_options_to_work_image.py b/tbx/work/migrations/0035_add_alt_text_options_to_work_image.py
index 025fe8c34..e9f83da6a 100644
--- a/tbx/work/migrations/0035_add_alt_text_options_to_work_image.py
+++ b/tbx/work/migrations/0035_add_alt_text_options_to_work_image.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("work", "0034_add_earth_colour_theme"),
     ]
diff --git a/tbx/work/models.py b/tbx/work/models.py
index 275da2b51..a78714b7b 100644
--- a/tbx/work/models.py
+++ b/tbx/work/models.py
@@ -1,6 +1,6 @@
+from itertools import chain
 import math
 import string
-from itertools import chain
 
 from django import forms
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
@@ -10,8 +10,14 @@
 from django.utils.functional import cached_property
 from django.utils.http import urlencode
 
-from bs4 import BeautifulSoup
 from modelcluster.fields import ParentalManyToManyField
+from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
+from wagtail.fields import RichTextField
+from wagtail.models import Page
+from wagtail.signals import page_published
+
+from bs4 import BeautifulSoup
+
 from tbx.core.blocks import StoryBlock
 from tbx.core.utils.fields import StreamField
 from tbx.core.utils.models import (
@@ -23,10 +29,6 @@
 from tbx.people.models import ContactMixin
 from tbx.taxonomy.models import Sector, Service
 from tbx.work.blocks import WorkStoryBlock
-from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
-from wagtail.fields import RichTextField
-from wagtail.models import Page
-from wagtail.signals import page_published
 
 
 class HistoricalWorkPage(
diff --git a/tbx/work/tests/test_models.py b/tbx/work/tests/test_models.py
index cc84d46ca..66d3dedd8 100644
--- a/tbx/work/tests/test_models.py
+++ b/tbx/work/tests/test_models.py
@@ -1,5 +1,9 @@
 from django.core.paginator import Page as PaginatorPage
 
+from wagtail.coreutils import get_dummy_request
+from wagtail.models import PageViewRestriction
+from wagtail.test.utils import WagtailPageTestCase
+
 from tbx.taxonomy.factories import ServiceFactory
 from tbx.work.factories import (
     HistoricalWorkPageFactory,
@@ -7,14 +11,9 @@
     WorkPageFactory,
 )
 from tbx.work.models import WorkPage
-from wagtail.coreutils import get_dummy_request
-from wagtail.models import PageViewRestriction
-from wagtail.test.utils import WagtailPageTestCase
 
 
 class TestWorkIndexPageFactory(WagtailPageTestCase):
-    # def test_create(self):
-    #     WorkIndexPageFactory()
     @classmethod
     def setUpTestData(cls):
         cls.work_index = WorkIndexPageFactory(title="Our work")
@@ -28,14 +27,12 @@ def setUpTestData(cls):
         PageViewRestriction.objects.create(
             page=cls.private_work_page,
             restriction_type="password",
-            password="password123",
+            password="password123",  # noqa: S106
         )
 
     def test_get_context(self):
         context = self.work_index.get_context(get_dummy_request())
         work_pages = context["works"]
-        print("work_pages")
-        print(work_pages)
         self.assertIsInstance(work_pages, PaginatorPage)
         self.assertEqual(work_pages[0]["title"], self.work_page.title)
 
diff --git a/tbx/wsgi.py b/tbx/wsgi.py
index f765976cf..45e487110 100644
--- a/tbx/wsgi.py
+++ b/tbx/wsgi.py
@@ -11,6 +11,7 @@
 
 from django.core.wsgi import get_wsgi_application
 
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tbx.settings.production")
 
 application = get_wsgi_application()