diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index 94b452e2faf87bbb42f3e35c24545aea3324e959..65ff60084487082b91d884ae7117ddb610dc558d 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -570,7 +570,7 @@ class ApplicationSubmission(
             return self.form_data[id]
         except KeyError as e:
             try:
-                transposed_must_include = {v:k for k,v in self.must_include.items()}
+                transposed_must_include = {v: k for k, v in self.must_include.items()}
                 actual_id = transposed_must_include[id]
             except KeyError:
                 # We have most likely progressed application forms so the data isnt in form_data
diff --git a/opentech/apply/funds/tests/factories/models.py b/opentech/apply/funds/tests/factories/models.py
index 9dc63483098b9159a5544404e650756f51c3dd64..cffdc36f173ab0db015ca56f1b1d5ebc88774158 100644
--- a/opentech/apply/funds/tests/factories/models.py
+++ b/opentech/apply/funds/tests/factories/models.py
@@ -1,4 +1,3 @@
-from collections import defaultdict
 import datetime
 
 import factory
diff --git a/opentech/apply/review/tests/factories/models.py b/opentech/apply/review/tests/factories/models.py
index 83ee6ce79beb240cc57884cc72f15d3e42119d2c..79a82eb4b6b3052a4a02bb00dde3aff66d3600b4 100644
--- a/opentech/apply/review/tests/factories/models.py
+++ b/opentech/apply/review/tests/factories/models.py
@@ -1,5 +1,3 @@
-from collections import defaultdict
-
 import factory
 
 from opentech.apply.funds.models.forms import ApplicationBaseReviewForm
@@ -13,9 +11,9 @@ from ...views import get_fields_for_stage
 
 from . import blocks
 
-__all__ = ['ReviewFactory', 'ReviewFormFactory', 'ApplicationBaseReviewFormFactory',
-           'ReviewFundTypeFactory', 'ReviewApplicationSubmissionFactory']
-
+__all__ = ['ReviewFactory', 'ReviewFormFactory',
+           'ApplicationBaseReviewFormFactory', 'ReviewFundTypeFactory',
+           'ReviewApplicationSubmissionFactory']
 
 
 class ReviewFormDataFactory(factory.DictFactory, metaclass=AddFormFieldsMetaclass):
@@ -46,7 +44,11 @@ class ReviewFactory(factory.DjangoModelFactory):
     submission = factory.SubFactory(ApplicationSubmissionFactory)
     author = factory.SubFactory(StaffFactory)
     form_fields = blocks.ReviewFormFieldsFactory
-    form_data = factory.SubFactory(ReviewFormDataFactory, form_fields=factory.SelfAttribute('..form_fields'), submission=factory.SelfAttribute('..submission'))
+    form_data = factory.SubFactory(
+        ReviewFormDataFactory,
+        form_fields=factory.SelfAttribute('..form_fields'),
+        submission=factory.SelfAttribute('..submission'),
+    )
     is_draft = False
     recommendation = NO
     score = 0
diff --git a/opentech/apply/stream_forms/testing/factories.py b/opentech/apply/stream_forms/testing/factories.py
index f1bdf4479318a462b333010c7dffe6e9c23ada6d..dfccb6bf957c067335c2f011f7f7d4a29025e96c 100644
--- a/opentech/apply/stream_forms/testing/factories.py
+++ b/opentech/apply/stream_forms/testing/factories.py
@@ -11,9 +11,10 @@ import wagtail_factories
 
 from opentech.apply.stream_forms import blocks as stream_blocks
 
-__all__ = ['CharBlockFactory', 'FormFieldBlockFactory', 'CharFieldBlockFactory', 'NumberFieldBlockFactory',
-           'RadioFieldBlockFactory', 'UploadableMediaFactory', 'ImageFieldBlockFactory', 'FileFieldBlockFactory',
-           'MultiFileFieldBlockFactory']
+__all__ = ['FormFieldBlockFactory', 'CharFieldBlockFactory',
+           'NumberFieldBlockFactory', 'RadioFieldBlockFactory',
+           'UploadableMediaFactory', 'ImageFieldBlockFactory',
+           'FileFieldBlockFactory', 'MultiFileFieldBlockFactory']
 
 
 class AnswerFactory(factory.Factory):
@@ -80,7 +81,6 @@ class FormFieldBlockFactory(wagtail_factories.StructBlockFactory):
     field_label = factory.Faker('sentence')
     help_text = factory.LazyAttribute(lambda o: str(o._Resolver__step.builder.factory_meta.model))
 
-
     class Meta:
         model = stream_blocks.FormFieldBlock