diff --git a/data_safe_haven/console/__init__.py b/data_safe_haven/console/__init__.py
index 133a48fc12..f30bda2882 100644
--- a/data_safe_haven/console/__init__.py
+++ b/data_safe_haven/console/__init__.py
@@ -1,5 +1,5 @@
 from .format import tabulate
-from .pretty import pretty_print as print  # noqa: A001
+from .pretty import pretty_print as print  # noqa: A004
 from .prompts import confirm
 
 __all__ = [
diff --git a/data_safe_haven/external/__init__.py b/data_safe_haven/external/__init__.py
index 5e46325958..d26ef75058 100644
--- a/data_safe_haven/external/__init__.py
+++ b/data_safe_haven/external/__init__.py
@@ -6,10 +6,10 @@
 from .interface.pulumi_account import PulumiAccount
 
 __all__ = [
-    "AzureSdk",
     "AzureContainerInstance",
     "AzureIPv4Range",
     "AzurePostgreSQLDatabase",
+    "AzureSdk",
     "GraphApi",
     "PulumiAccount",
 ]
diff --git a/data_safe_haven/infrastructure/common/__init__.py b/data_safe_haven/infrastructure/common/__init__.py
index 6106cac731..85184d6574 100644
--- a/data_safe_haven/infrastructure/common/__init__.py
+++ b/data_safe_haven/infrastructure/common/__init__.py
@@ -16,6 +16,8 @@
 
 __all__ = [
     "DockerHubCredentials",
+    "SREDnsIpRanges",
+    "SREIpRanges",
     "get_address_prefixes_from_subnet",
     "get_available_ips_from_subnet",
     "get_id_from_rg",
@@ -27,6 +29,4 @@
     "get_name_from_subnet",
     "get_name_from_vnet",
     "get_subscription_id_from_rg",
-    "SREDnsIpRanges",
-    "SREIpRanges",
 ]
diff --git a/data_safe_haven/infrastructure/components/__init__.py b/data_safe_haven/infrastructure/components/__init__.py
index 2b3dd67e7a..f4b93b9c3d 100644
--- a/data_safe_haven/infrastructure/components/__init__.py
+++ b/data_safe_haven/infrastructure/components/__init__.py
@@ -41,11 +41,11 @@
     "MicrosoftSQLDatabaseProps",
     "NFSV3BlobContainerComponent",
     "NFSV3BlobContainerProps",
-    "WrappedNFSV3StorageAccount",
     "PostgresqlDatabaseComponent",
     "PostgresqlDatabaseProps",
     "SSLCertificate",
     "SSLCertificateProps",
     "VMComponent",
     "WrappedLogAnalyticsWorkspace",
+    "WrappedNFSV3StorageAccount",
 ]
diff --git a/data_safe_haven/infrastructure/components/wrapped/__init__.py b/data_safe_haven/infrastructure/components/wrapped/__init__.py
index ef6e7374d2..b449f46859 100644
--- a/data_safe_haven/infrastructure/components/wrapped/__init__.py
+++ b/data_safe_haven/infrastructure/components/wrapped/__init__.py
@@ -2,6 +2,6 @@
 from .nfsv3_storage_account import WrappedNFSV3StorageAccount
 
 __all__ = [
-    "WrappedNFSV3StorageAccount",
     "WrappedLogAnalyticsWorkspace",
+    "WrappedNFSV3StorageAccount",
 ]
diff --git a/data_safe_haven/types/__init__.py b/data_safe_haven/types/__init__.py
index 728df06c19..bfe1f6898a 100644
--- a/data_safe_haven/types/__init__.py
+++ b/data_safe_haven/types/__init__.py
@@ -34,14 +34,14 @@
     "AzureDnsZoneNames",
     "AzureLocation",
     "AzurePremiumFileShareSize",
-    "AzureServiceTag",
     "AzureSdkCredentialScope",
+    "AzureServiceTag",
     "AzureSubscriptionName",
     "AzureVmSku",
     "DatabaseSystem",
     "EmailAddress",
-    "EntraApplicationId",
     "EntraAppPermissionType",
+    "EntraApplicationId",
     "EntraGroupName",
     "EntraSignInAudienceType",
     "FirewallPriorities",