diff --git a/datastore/additional_data/management/commands/delete_org_data.py b/datastore/additional_data/management/commands/delete_org_data.py
index 614c90d8..b5c4959b 100644
--- a/datastore/additional_data/management/commands/delete_org_data.py
+++ b/datastore/additional_data/management/commands/delete_org_data.py
@@ -8,7 +8,9 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         parser.add_argument(
-            "--no-prompt", action="store_true", help="Don't prompt before delete",
+            "--no-prompt",
+            action="store_true",
+            help="Don't prompt before delete",
         )
 
     def handle(self, *args, **options):
diff --git a/datastore/additional_data/sources/find_that_charity.py b/datastore/additional_data/sources/find_that_charity.py
index 24f50865..683ec934 100644
--- a/datastore/additional_data/sources/find_that_charity.py
+++ b/datastore/additional_data/sources/find_that_charity.py
@@ -7,8 +7,8 @@
 
 
 class FindThatCharitySource(object):
-    """ This is responsible for inputting and outputting data from the
-    FindThatCharity (FTC) organisation info data sources """
+    """This is responsible for inputting and outputting data from the
+    FindThatCharity (FTC) organisation info data sources"""
 
     ADDITIONAL_DATA_KEY = "recipientOrgInfos"
 
diff --git a/datastore/additional_data/sources/geo_lookup.py b/datastore/additional_data/sources/geo_lookup.py
index 1bed853f..67e1798b 100644
--- a/datastore/additional_data/sources/geo_lookup.py
+++ b/datastore/additional_data/sources/geo_lookup.py
@@ -17,14 +17,20 @@ class GeoLookupSource(object):
             "url_latlong": "https://raw.githubusercontent.com/drkane/geo-lookups/master/lsoa_latlong.csv",
             "field_areacode": "lsoa11cd",
             "field_areaname": "lsoa11nm",
-            "field_transforms": {"lad20cd": "ladcd", "lad20nm": "ladnm",},
+            "field_transforms": {
+                "lad20cd": "ladcd",
+                "lad20nm": "ladnm",
+            },
         },
         "msoa": {
             "url_lookup": "https://raw.githubusercontent.com/drkane/geo-lookups/master/msoa_la.csv",
             "url_latlong": "https://raw.githubusercontent.com/drkane/geo-lookups/master/msoa_latlong.csv",
             "field_areacode": "msoa11cd",
             "field_areaname": "msoa11hclnm",
-            "field_transforms": {"lad20cd": "ladcd", "lad20nm": "ladnm",},
+            "field_transforms": {
+                "lad20cd": "ladcd",
+                "lad20nm": "ladnm",
+            },
         },
         "ward": {
             "url_lookup": "https://raw.githubusercontent.com/drkane/geo-lookups/master/ward_all_codes.csv",
@@ -36,7 +42,10 @@ class GeoLookupSource(object):
             "url_lookup": "https://raw.githubusercontent.com/drkane/geo-lookups/master/la_all_codes.csv",
             "field_areacode": "ladcd",
             "field_areaname": "ladnm",
-            "field_transforms": {"lad20cd": "ladcd", "lad20nm": "ladnm",},
+            "field_transforms": {
+                "lad20cd": "ladcd",
+                "lad20nm": "ladnm",
+            },
         },
     }
 
diff --git a/datastore/db/management/commands/create_datagetter_data.py b/datastore/db/management/commands/create_datagetter_data.py
index d474da07..11680e3c 100644
--- a/datastore/db/management/commands/create_datagetter_data.py
+++ b/datastore/db/management/commands/create_datagetter_data.py
@@ -31,13 +31,13 @@ def add_arguments(self, parser):
         )
 
     def handle(self, *args, **options):
-        """ Create grantnav package:
+        """Create grantnav package:
 
-          - data_all.json (all sources)
-          - json_all/
-                |- grants.json (lists of grants)
-                |- grants.json
-                ...
+        - data_all.json (all sources)
+        - json_all/
+              |- grants.json (lists of grants)
+              |- grants.json
+              ...
         """
         spinner = Spinner()
         spinner.start()
diff --git a/datastore/db/management/commands/delete_datagetter_data.py b/datastore/db/management/commands/delete_datagetter_data.py
index f104c141..de1f35e0 100644
--- a/datastore/db/management/commands/delete_datagetter_data.py
+++ b/datastore/db/management/commands/delete_datagetter_data.py
@@ -16,11 +16,15 @@ def add_arguments(self, parser):
         )
 
         parser.add_argument(
-            "--no-prompt", action="store_true", help="Don't prompt for deletes",
+            "--no-prompt",
+            action="store_true",
+            help="Don't prompt for deletes",
         )
 
         parser.add_argument(
-            "--oldest", action="store_true", help="Delete the oldest datagetter data",
+            "--oldest",
+            action="store_true",
+            help="Delete the oldest datagetter data",
         )
 
     def handle(self, *args, **options):
diff --git a/datastore/db/management/commands/load_datagetter_data.py b/datastore/db/management/commands/load_datagetter_data.py
index e44fea4d..a5b8d68a 100644
--- a/datastore/db/management/commands/load_datagetter_data.py
+++ b/datastore/db/management/commands/load_datagetter_data.py
@@ -97,7 +97,8 @@ def load_data(self):
                 grants_added = grants_added + len(grant_data["grants"])
             except (FileNotFoundError, KeyError, TypeError, json.JSONDecodeError) as e:
                 print(
-                    "Skipping loading due to: '%s'" % e, file=self.stdout,
+                    "Skipping loading due to: '%s'" % e,
+                    file=self.stdout,
                 )
                 pass
 
diff --git a/datastore/db/migrations/0001_initial.py b/datastore/db/migrations/0001_initial.py
index f3181081..3e9796b8 100644
--- a/datastore/db/migrations/0001_initial.py
+++ b/datastore/db/migrations/0001_initial.py
@@ -50,7 +50,9 @@ class Migration(migrations.Migration):
                 ),
                 ("prefix", models.CharField(default=0, max_length=300)),
             ],
-            options={"unique_together": {("getter_run", "prefix")},},
+            options={
+                "unique_together": {("getter_run", "prefix")},
+            },
         ),
         migrations.CreateModel(
             name="SourceFile",
diff --git a/datastore/db/migrations/0005_auto_20190816_1015.py b/datastore/db/migrations/0005_auto_20190816_1015.py
index edc95905..92469ab7 100644
--- a/datastore/db/migrations/0005_auto_20190816_1015.py
+++ b/datastore/db/migrations/0005_auto_20190816_1015.py
@@ -11,6 +11,8 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AlterField(
-            model_name="status", name="when", field=models.DateTimeField(auto_now=True),
+            model_name="status",
+            name="when",
+            field=models.DateTimeField(auto_now=True),
         ),
     ]
diff --git a/datastore/db/migrations/0008_remove_latest_total_grants.py b/datastore/db/migrations/0008_remove_latest_total_grants.py
index 30bb5ba6..8bf95a25 100644
--- a/datastore/db/migrations/0008_remove_latest_total_grants.py
+++ b/datastore/db/migrations/0008_remove_latest_total_grants.py
@@ -10,5 +10,8 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(model_name="latest", name="total_grants",),
+        migrations.RemoveField(
+            model_name="latest",
+            name="total_grants",
+        ),
     ]
diff --git a/datastore/db/migrations/0010_auto_20200916_1109.py b/datastore/db/migrations/0010_auto_20200916_1109.py
index 90e4bc84..234ad9bf 100644
--- a/datastore/db/migrations/0010_auto_20200916_1109.py
+++ b/datastore/db/migrations/0010_auto_20200916_1109.py
@@ -11,9 +11,11 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AlterModelOptions(
-            name="publisher", options={"ordering": ["prefix"]},
+            name="publisher",
+            options={"ordering": ["prefix"]},
         ),
         migrations.AlterModelOptions(
-            name="sourcefile", options={"ordering": ["data__publisher__prefix"]},
+            name="sourcefile",
+            options={"ordering": ["data__publisher__prefix"]},
         ),
     ]
diff --git a/datastore/settings/settings.py b/datastore/settings/settings.py
index e43fe420..9ef7635f 100644
--- a/datastore/settings/settings.py
+++ b/datastore/settings/settings.py
@@ -104,9 +104,15 @@
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
     },
-    {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",},
-    {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",},
-    {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",},
+    {
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
+    },
 ]
 
 
diff --git a/datastore/tests/test_additional_data_geolookups.py b/datastore/tests/test_additional_data_geolookups.py
index 2b7f66c3..67c2bb1e 100644
--- a/datastore/tests/test_additional_data_geolookups.py
+++ b/datastore/tests/test_additional_data_geolookups.py
@@ -139,7 +139,8 @@ def test_nspl_update_additional_data_beneficiaryLocation_prioritised(self):
 
         self.assertIn("locationLookup", additional_data)
         self.assertEqual(
-            len(additional_data["locationLookup"]), 1,
+            len(additional_data["locationLookup"]),
+            1,
         )
 
     def test_nspl_update_additional_data_recipientOrganization(self):