diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 0bdcb4da8..168b266cf 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -3216,7 +3216,7 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         ):
             return True
         return super().has_change_permission(request, obj)
-    
+
     def get_queryset(self, request):
         """Custom get_queryset to filter by portfolio if portfolio is in the
         request params."""
diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py
index ff72359d6..7ab4bf020 100644
--- a/src/registrar/tests/test_reports.py
+++ b/src/registrar/tests/test_reports.py
@@ -245,18 +245,23 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
         expected_content = (
             "Domain name,Status,First ready on,Expiration date,Domain type,Agency,Organization name,City,State,SO,"
             "SO email,Security contact email,Domain managers,Invited domain managers\n"
-            "cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,WorldWarICentennialCommission,,,, ,,(blank),meoward@rocks.com,\n"
-            "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,WorldWarICentennialCommission,,,, ,,(blank),"
+            "cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,WorldWarICentennialCommission"
+            ",,,, ,,(blank),meoward@rocks.com,\n"
+            "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,WorldWarICentennialCommission"
+            ",,,, ,,(blank),"
             '"big_lebowski@dude.co, info@example.com, meoward@rocks.com",woofwardthethird@rocks.com\n'
-            "adomain10.gov,Ready,2024-04-03,(blank),Federal,ArmedForcesRetirementHome,,,, ,,(blank),,squeaker@rocks.com\n"
+            "adomain10.gov,Ready,2024-04-03,(blank),Federal,ArmedForcesRetirementHome,,,, ,,(blank),,"
+            "squeaker@rocks.com\n"
             "bdomain4.gov,Unknown,(blank),(blank),Federal,ArmedForcesRetirementHome,,,, ,,(blank),,\n"
             "bdomain5.gov,Deleted,(blank),(blank),Federal,ArmedForcesRetirementHome,,,, ,,(blank),,\n"
             "bdomain6.gov,Deleted,(blank),(blank),Federal,ArmedForcesRetirementHome,,,, ,,(blank),,\n"
-            "ddomain3.gov,On hold,(blank),2023-11-15,Federal,ArmedForcesRetirementHome,,,, ,,security@mail.gov,,\n"
+            "ddomain3.gov,On hold,(blank),2023-11-15,Federal,ArmedForcesRetirementHome,,,, ,,"
+            "security@mail.gov,,\n"
             "sdomain8.gov,Deleted,(blank),(blank),Federal,ArmedForcesRetirementHome,,,, ,,(blank),,\n"
             "xdomain7.gov,Deleted,(blank),(blank),Federal,ArmedForcesRetirementHome,,,, ,,(blank),,\n"
             "zdomain9.gov,Deleted,(blank),(blank),Federal,ArmedForcesRetirementHome,,,, ,,(blank),,\n"
-            "adomain2.gov,Dns needed,(blank),(blank),Interstate,,,,, ,,(blank),meoward@rocks.com,squeaker@rocks.com\n"
+            "adomain2.gov,Dns needed,(blank),(blank),Interstate,,,,, ,,(blank),meoward@rocks.com,"
+            "squeaker@rocks.com\n"
             "zdomain12.gov,Ready,2024-04-02,(blank),Interstate,,,,, ,,(blank),meoward@rocks.com,\n"
         )
 
@@ -302,7 +307,8 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
             "Domain name,Status,First ready on,Expiration date,Domain type,Agency,Organization name,"
             "City,State,SO,SO email,"
             "Security contact email,Domain managers,Invited domain managers\n"
-            "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,WorldWarICentennialCommission,,,, ,,(blank),"
+            "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,"
+            "WorldWarICentennialCommission,,,, ,,(blank),"
             '"big_lebowski@dude.co, info@example.com, meoward@rocks.com",woofwardthethird@rocks.com\n'
             "adomain2.gov,Dns needed,(blank),(blank),Interstate,,,,, ,,(blank),"
             '"info@example.com, meoward@rocks.com",squeaker@rocks.com\n'
@@ -539,7 +545,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
     def test_domain_growth(self):
         """Shows ready and deleted domains within a date range, sorted"""
         # Remove "Created at" and "First ready" because we can't guess this immutable, dynamically generated test data
-        self.maxDiff=None
+        self.maxDiff = None
         columns = [
             "Domain name",
             "Domain type",
diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py
index 21088424e..a8bb9471d 100644
--- a/src/registrar/utility/csv_export.py
+++ b/src/registrar/utility/csv_export.py
@@ -324,7 +324,10 @@ class DomainExport(BaseExport):
             "converted_federal_type": Case(
                 # When portfolio is present, use its value instead
                 # NOTE: this is an @Property funciton in portfolio.
-                When(Q(portfolio__isnull=False) & Q(portfolio__federal_agency__isnull=False), then=F("portfolio__federal_agency__federal_type")),
+                When(
+                    Q(portfolio__isnull=False) & Q(portfolio__federal_agency__isnull=False),
+                    then=F("portfolio__federal_agency__federal_type"),
+                ),
                 # Otherwise, return the natively assigned value
                 default=F("federal_type"),
                 output_field=CharField(),
@@ -638,7 +641,6 @@ class DomainDataType(DomainExport):
             "Domain managers",
             "Invited domain managers",
         ]
-    
 
     @classmethod
     def get_annotations_for_sort(cls, delimiter=", "):
@@ -852,7 +854,7 @@ class DomainDataFull(DomainExport):
             "State",
             "Security contact email",
         ]
-    
+
     @classmethod
     def get_annotations_for_sort(cls, delimiter=", "):
         """
@@ -940,14 +942,13 @@ class DomainDataFederal(DomainExport):
             "Security contact email",
         ]
 
-
     @classmethod
     def get_annotations_for_sort(cls, delimiter=", "):
         """
         Get a dict of annotations to make available for sorting.
         """
         return cls.get_computed_fields()
-    
+
     @classmethod
     def get_sort_fields(cls):
         """
@@ -1400,7 +1401,10 @@ class DomainRequestExport(BaseExport):
             "converted_federal_type": Case(
                 # When portfolio is present, use its value instead
                 # NOTE: this is an @Property funciton in portfolio.
-                When(Q(portfolio__isnull=False) & Q(portfolio__federal_agency__isnull=False), then=F("portfolio__federal_agency__federal_type")),
+                When(
+                    Q(portfolio__isnull=False) & Q(portfolio__federal_agency__isnull=False),
+                    then=F("portfolio__federal_agency__federal_type"),
+                ),
                 # Otherwise, return the natively assigned value
                 default=F("federal_type"),
                 output_field=CharField(),