diff --git a/dojo/admin.py b/dojo/admin.py
index a2452ce1e5..c40d39e3c2 100644
--- a/dojo/admin.py
+++ b/dojo/admin.py
@@ -22,29 +22,25 @@
 
 
 class QuestionChildAdmin(PolymorphicChildModelAdmin):
-    """
-    Base admin class for all child models of Question
-    """
+
+    """Base admin class for all child models of Question"""
 
     base_model = Question
 
 
 class TextQuestionAdmin(QuestionChildAdmin):
-    """
-    ModelAdmin for a TextQuestion
-    """
+
+    """ModelAdmin for a TextQuestion"""
 
 
 class ChoiceQuestionAdmin(QuestionChildAdmin):
-    """
-    ModelAdmin for a ChoiceQuestion
-    """
+
+    """ModelAdmin for a ChoiceQuestion"""
 
 
 class QuestionParentAdmin(PolymorphicParentModelAdmin):
-    """
-    Question parent model admin
-    """
+
+    """Question parent model admin"""
 
     base_model = Question
     child_models = (
@@ -60,29 +56,25 @@ class QuestionParentAdmin(PolymorphicParentModelAdmin):
 
 
 class AnswerChildAdmin(PolymorphicChildModelAdmin):
-    """
-    Base admin class for all child Answer models
-    """
+
+    """Base admin class for all child Answer models"""
 
     base_model = Answer
 
 
 class TextAnswerAdmin(AnswerChildAdmin):
-    """
-    ModelAdmin for TextAnswer
-    """
+
+    """ModelAdmin for TextAnswer"""
 
 
 class ChoiceAnswerAdmin(AnswerChildAdmin):
-    """
-    ModelAdmin for ChoiceAnswer
-    """
+
+    """ModelAdmin for ChoiceAnswer"""
 
 
 class AnswerParentAdmin(PolymorphicParentModelAdmin):
-    """
-    The parent model admin for answer
-    """
+
+    """The parent model admin for answer"""
 
     list_display = (
         "answered_survey",
diff --git a/dojo/api_v2/prefetch/prefetcher.py b/dojo/api_v2/prefetch/prefetcher.py
index 3596b3f940..917afd2a04 100644
--- a/dojo/api_v2/prefetch/prefetcher.py
+++ b/dojo/api_v2/prefetch/prefetcher.py
@@ -18,7 +18,8 @@
 class _Prefetcher:
     @staticmethod
     def _build_serializers():
-        """Returns a map model -> serializer where model is a django model and serializer is the corresponding
+        """
+        Returns a map model -> serializer where model is a django model and serializer is the corresponding
         serializer used to serialize the model
 
         Returns:
@@ -52,7 +53,8 @@ def __init__(self):
         self._prefetch_data = {}
 
     def _find_serializer(self, field_type):
-        """Find the best suited serializer for the given type.
+        """
+        Find the best suited serializer for the given type.
 
         Args:
             field_type (django.db.models.fields): the field type for which we need to find a serializer
@@ -72,7 +74,8 @@ def _find_serializer(self, field_type):
         return self._find_serializer(parent_class)
 
     def _prefetch(self, entry, fields_to_fetch):
-        """Apply prefetching for the given field on the given entry
+        """
+        Apply prefetching for the given field on the given entry
 
         Args:
             entry (ModelInstance): Instance of a model as returned by a django queryset
diff --git a/dojo/api_v2/prefetch/schema.py b/dojo/api_v2/prefetch/schema.py
index 535e01e4e6..ef5cbbf389 100644
--- a/dojo/api_v2/prefetch/schema.py
+++ b/dojo/api_v2/prefetch/schema.py
@@ -18,7 +18,8 @@ def _get_path_to_GET_serializer_map(generator):
 
 
 def get_serializer_ref_name(serializer):
-    """Get serializer's ref_name
+    """
+    Get serializer's ref_name
     inspired by https://github.com/axnsan12/drf-yasg/blob/78031f0c189585c30fccb5005a6899f2d34289a9/src/drf_yasg/utils.py#L416
 
     :param serializer: Serializer instance
@@ -37,14 +38,14 @@ def get_serializer_ref_name(serializer):
 
 
 def prefetch_postprocessing_hook(result, generator, request, public):
-    """OpenAPI v3 (drf-spectacular) Some endpoints are using the PrefetchListMixin and PrefetchRetrieveMixin.
+    """
+    OpenAPI v3 (drf-spectacular) Some endpoints are using the PrefetchListMixin and PrefetchRetrieveMixin.
     These have nothing to do with Django prefetch_related.
     The endpoints have an @extend_schema configured with an extra parameter 'prefetch'
     This parameter contains an array of relations to prefetch. These prefetched models
     will be returned in an additional property in the response.
     The below processor ensures the result schema matches this.
     """
-
     serializer_classes = _get_path_to_GET_serializer_map(generator)
 
     paths = result.get("paths", {})
diff --git a/dojo/api_v2/prefetch/utils.py b/dojo/api_v2/prefetch/utils.py
index de7ea2b383..5e588e03ce 100644
--- a/dojo/api_v2/prefetch/utils.py
+++ b/dojo/api_v2/prefetch/utils.py
@@ -2,7 +2,8 @@
 
 
 def _is_many_to_many_relation(field):
-    """Check if a field specified a many-to-many relationship as defined by django.
+    """
+    Check if a field specified a many-to-many relationship as defined by django.
     This is the case if the field is an instance of the ManyToManyDescriptor as generated
     by the django framework
 
@@ -16,7 +17,8 @@ def _is_many_to_many_relation(field):
 
 
 def _is_one_to_one_relation(field):
-    """Check if a field specified a one-to-one relationship as defined by django.
+    """
+    Check if a field specified a one-to-one relationship as defined by django.
     This is the case if the field is an instance of the ForwardManyToOne as generated
     by the django framework
 
@@ -30,7 +32,8 @@ def _is_one_to_one_relation(field):
 
 
 def _get_prefetchable_fields(serializer):
-    """Get the fields that are prefetchable according to the serializer description.
+    """
+    Get the fields that are prefetchable according to the serializer description.
     Method mainly used by for automatic schema generation.
 
     Args:
diff --git a/dojo/api_v2/views.py b/dojo/api_v2/views.py
index 9e8368d627..a74442aa96 100644
--- a/dojo/api_v2/views.py
+++ b/dojo/api_v2/views.py
@@ -2360,6 +2360,7 @@ def get(self, request, format=None):
 
 # Authorization: authenticated users, DjangoModelPermissions
 class ImportScanView(mixins.CreateModelMixin, viewsets.GenericViewSet):
+
     """
     Imports a scan report into an engagement or product.
 
@@ -2423,6 +2424,7 @@ def get_queryset(self):
 class EndpointMetaImporterView(
     mixins.CreateModelMixin, viewsets.GenericViewSet,
 ):
+
     """
     Imports a CSV file into a product to propagate arbitrary meta and tags on endpoints.
 
@@ -2498,6 +2500,7 @@ def get_queryset(self):
 
 # Authorization: object-based
 class ReImportScanView(mixins.CreateModelMixin, viewsets.GenericViewSet):
+
     """
     Reimports a scan report into an existing test.
 
@@ -2898,6 +2901,7 @@ def report_generate(request, obj, options):
 class SystemSettingsViewSet(
     mixins.ListModelMixin, mixins.UpdateModelMixin, viewsets.GenericViewSet,
 ):
+
     """Basic control over System Settings. Use 'id' 1 for PUT, PATCH operations"""
 
     permission_classes = (permissions.IsSuperUser, DjangoModelPermissions)
diff --git a/dojo/authorization/authorization_decorators.py b/dojo/authorization/authorization_decorators.py
index 3063d0821d..1f1bc9dbcb 100644
--- a/dojo/authorization/authorization_decorators.py
+++ b/dojo/authorization/authorization_decorators.py
@@ -12,7 +12,6 @@
 
 def user_is_authorized(model, permission, arg, lookup="pk", func=None):
     """Decorator for functions that ensures the user has permission on an object."""
-
     if func is None:
         return functools.partial(
             user_is_authorized, model, permission, arg, lookup,
@@ -41,7 +40,6 @@ def _wrapped(request, *args, **kwargs):
 
 def user_has_global_permission(permission, func=None):
     """Decorator for functions that ensures the user has a (global) permission"""
-
     if func is None:
         return functools.partial(user_has_global_permission, permission)
 
@@ -54,10 +52,7 @@ def _wrapped(request, *args, **kwargs):
 
 
 def user_is_configuration_authorized(permission, func=None):
-    """
-    Decorator for views that checks whether a user has a particular permission enabled.
-    """
-
+    """Decorator for views that checks whether a user has a particular permission enabled."""
     if func is None:
         return functools.partial(user_is_configuration_authorized, permission)
 
diff --git a/dojo/authorization/roles_permissions.py b/dojo/authorization/roles_permissions.py
index 779463258f..530008a2f7 100644
--- a/dojo/authorization/roles_permissions.py
+++ b/dojo/authorization/roles_permissions.py
@@ -517,9 +517,7 @@ def get_roles_with_permissions():
 
 
 def get_global_roles_with_permissions():
-    """
-    Extra permissions for global roles, on top of the permissions granted to the "normal" roles above.
-    """
+    """Extra permissions for global roles, on top of the permissions granted to the "normal" roles above."""
     return {
         Roles.Maintainer: {Permissions.Product_Type_Add},
         Roles.Owner: {Permissions.Product_Type_Add},
diff --git a/dojo/engagement/views.py b/dojo/engagement/views.py
index 94e7cec960..ea73bd80c6 100644
--- a/dojo/engagement/views.py
+++ b/dojo/engagement/views.py
@@ -693,9 +693,7 @@ def add_tests(request, eid):
 
 class ImportScanResultsView(View):
     def get_template(self) -> str:
-        """
-        Returns the template that will be presented to the user
-        """
+        """Returns the template that will be presented to the user"""
         return "dojo/import_scan_results.html"
 
     def get_development_environment(
@@ -715,9 +713,7 @@ def get_engagement_or_product(
         engagement_id: Optional[int] = None,
         product_id: Optional[int] = None,
     ) -> Tuple[Engagement, Product, Product | Engagement]:
-        """
-        Using the path parameters, either fetch the product or engagement
-        """
+        """Using the path parameters, either fetch the product or engagement"""
         engagement = product = engagement_or_product = None
         # Get the product if supplied
         # Get the engagement if supplied
@@ -740,9 +736,7 @@ def get_form(
         request: HttpRequest,
         **kwargs: dict,
     ) -> ImportScanForm:
-        """
-        Returns the default import form for importing findings
-        """
+        """Returns the default import form for importing findings"""
         if request.method == "POST":
             return ImportScanForm(request.POST, request.FILES, **kwargs)
         return ImportScanForm(**kwargs)
@@ -776,9 +770,7 @@ def get_jira_form(
         request: HttpRequest,
         engagement_or_product: Engagement | Product,
     ) -> Tuple[JIRAImportScanForm | None, bool]:
-        """
-        Returns a JiraImportScanForm if jira is enabled
-        """
+        """Returns a JiraImportScanForm if jira is enabled"""
         jira_form = None
         push_all_jira_issues = False
         # Determine if jira issues should be pushed automatically
@@ -919,18 +911,14 @@ def get_importer(
         self,
         context: dict,
     ) -> BaseImporter:
-        """
-        Gets the importer to use
-        """
+        """Gets the importer to use"""
         return DefaultImporter(**context)
 
     def import_findings(
         self,
         context: dict,
     ) -> str | None:
-        """
-        Attempt to import with all the supplied information
-        """
+        """Attempt to import with all the supplied information"""
         try:
             importer_client = self.get_importer(context)
             context["test"], _, finding_count, closed_finding_count, _, _, _ = importer_client.process_scan(
@@ -952,9 +940,7 @@ def process_form(
         form: ImportScanForm,
         context: dict,
     ) -> str | None:
-        """
-        Process the form and manipulate the input in any way that is appropriate
-        """
+        """Process the form and manipulate the input in any way that is appropriate"""
         # Update the running context dict with cleaned form input
         context.update({
             "scan": request.FILES.get("file", None),
@@ -1024,9 +1010,7 @@ def process_credentials_form(
         form: CredMappingForm,
         context: dict,
     ) -> str | None:
-        """
-        Process the credentials form by creating
-        """
+        """Process the credentials form by creating"""
         if cred_user := form.cleaned_data["cred_user"]:
             # Select the credential mapping object from the selected list and only allow if the credential is associated with the product
             cred_user = Cred_Mapping.objects.filter(
@@ -1046,18 +1030,14 @@ def success_redirect(
         self,
         context: dict,
     ) -> HttpResponseRedirect:
-        """
-        Redirect the user to a place that indicates a successful import
-        """
+        """Redirect the user to a place that indicates a successful import"""
         return HttpResponseRedirect(reverse("view_test", args=(context.get("test").id, )))
 
     def failure_redirect(
         self,
         context: dict,
     ) -> HttpResponseRedirect:
-        """
-        Redirect the user to a place that indicates a failed import
-        """
+        """Redirect the user to a place that indicates a failed import"""
         return HttpResponseRedirect(reverse(
             "import_scan_results",
             args=(context.get("engagement", context.get("product")).id, ),
@@ -1069,9 +1049,7 @@ def get(
         engagement_id: Optional[int] = None,
         product_id: Optional[int] = None,
     ) -> HttpResponse:
-        """
-        Process GET requests for the Import View
-        """
+        """Process GET requests for the Import View"""
         # process the request and path parameters
         request, context = self.handle_request(
             request,
@@ -1087,9 +1065,7 @@ def post(
         engagement_id: Optional[int] = None,
         product_id: Optional[int] = None,
     ) -> HttpResponse:
-        """
-        Process POST requests for the Import View
-        """
+        """Process POST requests for the Import View"""
         # process the request and path parameters
         request, context = self.handle_request(
             request,
diff --git a/dojo/finding/helper.py b/dojo/finding/helper.py
index d52857f229..1182cb26d6 100644
--- a/dojo/finding/helper.py
+++ b/dojo/finding/helper.py
@@ -566,7 +566,7 @@ def engagement_post_delete(sender, instance, **kwargs):
 
 
 def fix_loop_duplicates():
-    """ Due to bugs in the past and even currently when under high parallel load, there can be transitive duplicates. """
+    """Due to bugs in the past and even currently when under high parallel load, there can be transitive duplicates."""
     """ i.e. A -> B -> C. This can lead to problems when deleting findingns, performing deduplication, etc """
     candidates = Finding.objects.filter(duplicate_finding__isnull=False, original_finding__isnull=False).order_by("-id")
 
diff --git a/dojo/forms.py b/dojo/forms.py
index abd5a40d9c..c398fb21d0 100644
--- a/dojo/forms.py
+++ b/dojo/forms.py
@@ -140,6 +140,7 @@ def render(self, name, *args, **kwargs):
 
 
 class MonthYearWidget(Widget):
+
     """
     A Widget that splits date input into two <select> boxes for month and year,
     with 'day' defaulting to the first of the month.
@@ -148,6 +149,7 @@ class MonthYearWidget(Widget):
 
     django/trunk/django/forms/extras/widgets.py
     """
+
     none_value = (0, "---")
     month_field = "%s_month"
     year_field = "%s_year"
@@ -3176,8 +3178,8 @@ def __init__(self, *args, **kwargs):
 # Show in admin a multichoice list of validator names
 # pass this to form using field_name='validator_name' ?
 class QuestionForm(forms.Form):
-    """ Base class for a Question
-    """
+
+    """Base class for a Question"""
 
     def __init__(self, *args, **kwargs):
         self.helper = FormHelper()
diff --git a/dojo/importers/auto_create_context.py b/dojo/importers/auto_create_context.py
index 9f2a1cb7e7..1645456862 100644
--- a/dojo/importers/auto_create_context.py
+++ b/dojo/importers/auto_create_context.py
@@ -23,6 +23,7 @@
 
 
 class AutoCreateContextManager:
+
     """
     Management of safely fetching and creating resources used in the import
     and reimport processes. Resources managed by this class are:
@@ -31,6 +32,7 @@ class AutoCreateContextManager:
     - Engagements
     - Tests
     """
+
     """
     ===================================
     ----------- Validators ------------
@@ -286,9 +288,7 @@ def get_or_create_engagement(
         target_end: Optional[datetime] = None,
         **kwargs: dict,
     ) -> Engagement:
-        """
-        Fetches an engagement by name or ID if one already exists.
-        """
+        """Fetches an engagement by name or ID if one already exists."""
         # try to find the engagement (and product)
         product = self.get_target_product_if_exists(
             product_name=product_name,
diff --git a/dojo/importers/base_importer.py b/dojo/importers/base_importer.py
index 6a05b3934c..ebd97fc37f 100644
--- a/dojo/importers/base_importer.py
+++ b/dojo/importers/base_importer.py
@@ -36,6 +36,7 @@
 
 
 class Parser:
+
     """
     This class is used as an alias to a given parser
     and is purely for the sake of type hinting
@@ -52,11 +53,13 @@ def get_findings(scan_type: str, test: Test) -> List[Finding]:
 
 
 class BaseImporter(ImporterOptions):
+
     """
     A collection of utilities used by various importers within DefectDojo.
     Some of these commonalities may be fully used by children importers,
     or even extended
     """
+
     def __init__(
         self,
         *args: list,
@@ -166,9 +169,7 @@ def parse_dynamic_test_type_tests(
         scan: TemporaryUploadedFile,
         parser: Parser,
     ) -> List[Test]:
-        """
-        Use the API configuration object to get the tests to be used by the parser
-        """
+        """Use the API configuration object to get the tests to be used by the parser"""
         try:
             return parser.get_tests(self.scan_type, scan)
         except ValueError as e:
@@ -322,9 +323,7 @@ def update_import_history(
         reactivated_findings: List[Finding] = [],
         untouched_findings: List[Finding] = [],
     ) -> Test_Import:
-        """
-        Creates a record of the import or reimport operation that has occurred.
-        """
+        """Creates a record of the import or reimport operation that has occurred."""
         # Quick fail check to determine if we even wanted this
         if settings.TRACK_IMPORT_HISTORY is False:
             return None
diff --git a/dojo/importers/default_importer.py b/dojo/importers/default_importer.py
index 41e91bc12d..815170faf6 100644
--- a/dojo/importers/default_importer.py
+++ b/dojo/importers/default_importer.py
@@ -37,12 +37,14 @@ def validate_engagement(
 
 
 class DefaultImporter(BaseImporter, DefaultImporterOptions):
+
     """
     The classic importer process used by DefectDojo
 
     This Importer is intended to be used when auditing the history
     of findings at a given point in time is required
     """
+
     def __init__(self, *args, **kwargs):
         super().__init__(
             self,
diff --git a/dojo/importers/default_reimporter.py b/dojo/importers/default_reimporter.py
index 9063838c73..ed9afd2ede 100644
--- a/dojo/importers/default_reimporter.py
+++ b/dojo/importers/default_reimporter.py
@@ -51,6 +51,7 @@ def validate_environment(
 
 
 class DefaultReImporter(BaseImporter, DefaultReImporterOptions):
+
     """
     The classic reimporter process used by DefectDojo
 
@@ -58,6 +59,7 @@ class DefaultReImporter(BaseImporter, DefaultReImporterOptions):
     vulnerabilities is the ultimate tool for getting a current
     point time view of security of a given product
     """
+
     def __init__(self, *args, **kwargs):
         super().__init__(
             self,
@@ -166,7 +168,6 @@ def process_findings(
         the finding may be appended to a new or existing group based upon user selection
         at import time
         """
-
         self.deduplication_algorithm = self.determine_deduplication_algorithm()
         self.original_items = list(self.test.finding_set.all())
         self.new_items = []
@@ -388,9 +389,7 @@ def match_new_finding_to_existing_finding(
         self,
         unsaved_finding: Finding,
     ) -> List[Finding]:
-        """
-        Matches a single new finding to N existing findings and then returns those matches
-        """
+        """Matches a single new finding to N existing findings and then returns those matches"""
         # This code should match the logic used for deduplication out of the re-import feature.
         # See utils.py deduplicate_* functions
         deduplicationLogger.debug("return findings bases on algorithm: %s", self.deduplication_algorithm)
@@ -644,9 +643,7 @@ def process_finding_that_was_not_matched(
         self,
         unsaved_finding: Finding,
     ) -> Finding:
-        """
-        Create a new finding from the one parsed from the report
-        """
+        """Create a new finding from the one parsed from the report"""
         # Set some explicit settings
         unsaved_finding.reporter = self.user
         unsaved_finding.last_reviewed = self.now
diff --git a/dojo/importers/endpoint_manager.py b/dojo/importers/endpoint_manager.py
index ba7172efaa..6686584da3 100644
--- a/dojo/importers/endpoint_manager.py
+++ b/dojo/importers/endpoint_manager.py
@@ -28,9 +28,7 @@ def add_endpoints_to_unsaved_finding(
         endpoints: List[Endpoint],
         **kwargs: dict,
     ) -> None:
-        """
-        Creates Endpoint objects for a single finding and creates the link via the endpoint status
-        """
+        """Creates Endpoint objects for a single finding and creates the link via the endpoint status"""
         logger.debug(f"IMPORT_SCAN: Adding {len(endpoints)} endpoints to finding: {finding}")
         self.clean_unsaved_endpoints(endpoints)
         for endpoint in endpoints:
@@ -67,9 +65,7 @@ def mitigate_endpoint_status(
         user: Dojo_User,
         **kwargs: dict,
     ) -> None:
-        """
-        Mitigates all endpoint status objects that are supplied
-        """
+        """Mitigates all endpoint status objects that are supplied"""
         now = timezone.now()
         for endpoint_status in endpoint_status_list:
             # Only mitigate endpoints that are actually active
@@ -88,9 +84,7 @@ def reactivate_endpoint_status(
         endpoint_status_list: List[Endpoint_Status],
         **kwargs: dict,
     ) -> None:
-        """
-        Reactivate all endpoint status objects that are supplied
-        """
+        """Reactivate all endpoint status objects that are supplied"""
         for endpoint_status in endpoint_status_list:
             # Only reactivate endpoints that are actually mitigated
             if endpoint_status.mitigated:
@@ -216,9 +210,7 @@ def update_endpoint_status(
         user: Dojo_User,
         **kwargs: dict,
     ) -> None:
-        """
-        Update the list of endpoints from the new finding with the list that is in the old finding
-        """
+        """Update the list of endpoints from the new finding with the list that is in the old finding"""
         # New endpoints are already added in serializers.py / views.py (see comment "# for existing findings: make sure endpoints are present or created")
         # So we only need to mitigate endpoints that are no longer present
         # using `.all()` will mark as mitigated also `endpoint_status` with flags `false_positive`, `out_of_scope` and `risk_accepted`. This is a known issue. This is not a bug. This is a future.
diff --git a/dojo/importers/options.py b/dojo/importers/options.py
index bfa6143a3c..2431975856 100644
--- a/dojo/importers/options.py
+++ b/dojo/importers/options.py
@@ -25,11 +25,13 @@
 
 
 class ImporterOptions:
+
     """
     Converts the supplied kwargs into a class for global mutability
     as well as making it more clear which fields are used in each
     function.
     """
+
     def __init__(
         self,
         *args: list,
diff --git a/dojo/jira_link/helper.py b/dojo/jira_link/helper.py
index 85d5e1bbbb..c05f880826 100644
--- a/dojo/jira_link/helper.py
+++ b/dojo/jira_link/helper.py
@@ -1603,7 +1603,7 @@ def escape_for_jira(text):
 
 
 def process_resolution_from_jira(finding, resolution_id, resolution_name, assignee_name, jira_now, jira_issue) -> bool:
-    """ Processes the resolution field in the JIRA issue and updated the finding in Defect Dojo accordingly """
+    """Processes the resolution field in the JIRA issue and updated the finding in Defect Dojo accordingly"""
     import dojo.risk_acceptance.helper as ra_helper
     status_changed = False
     resolved = resolution_id is not None
diff --git a/dojo/jira_link/views.py b/dojo/jira_link/views.py
index fc2f67a373..7ab70a1f5a 100644
--- a/dojo/jira_link/views.py
+++ b/dojo/jira_link/views.py
@@ -168,46 +168,46 @@ def webhook(request, secret=None):
 
 def check_for_and_create_comment(parsed_json):
     """
-        example incoming requests from JIRA Server 8.14.0
-        {
-        "timestamp":1610269967824,
-        "webhookEvent":"comment_created",
-        "comment":{
-            "self":"https://jira.host.com/rest/api/2/issue/115254/comment/466578",
-            "id":"466578",
-            "author":{
-                "self":"https://jira.host.com/rest/api/2/user?username=defect.dojo",
-                "name":"defect.dojo",
-                "key":"defect.dojo", # seems to be only present on JIRA Server, not on Cloud
-                "avatarUrls":{
-                    "48x48":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=48",
-                    "24x24":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=24",
-                    "16x16":"https://www.gravatar.com/avatar9637bfb970eff6176357df615f548f1c?d=mm&s=16",
-                    "32x32":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=32"
-                },
-                "displayName":"Defect Dojo",
-                "active":true,
-                "timeZone":"Europe/Amsterdam"
+    example incoming requests from JIRA Server 8.14.0
+    {
+    "timestamp":1610269967824,
+    "webhookEvent":"comment_created",
+    "comment":{
+        "self":"https://jira.host.com/rest/api/2/issue/115254/comment/466578",
+        "id":"466578",
+        "author":{
+            "self":"https://jira.host.com/rest/api/2/user?username=defect.dojo",
+            "name":"defect.dojo",
+            "key":"defect.dojo", # seems to be only present on JIRA Server, not on Cloud
+            "avatarUrls":{
+                "48x48":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=48",
+                "24x24":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=24",
+                "16x16":"https://www.gravatar.com/avatar9637bfb970eff6176357df615f548f1c?d=mm&s=16",
+                "32x32":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=32"
             },
-            "body":"(Valentijn Scholten):test4",
-            "updateAuthor":{
-                "self":"https://jira.host.com/rest/api/2/user?username=defect.dojo",
-                "name":"defect.dojo",
-                "key":"defect.dojo",
-                "avatarUrls":{
-                    "48x48":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=48",
-                    "24x24""https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=24",
-                    "16x16":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=16",
-                    "32x32":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=32"
-                },
-                "displayName":"Defect Dojo",
-                "active":true,
-                "timeZone":"Europe/Amsterdam"
+            "displayName":"Defect Dojo",
+            "active":true,
+            "timeZone":"Europe/Amsterdam"
+        },
+        "body":"(Valentijn Scholten):test4",
+        "updateAuthor":{
+            "self":"https://jira.host.com/rest/api/2/user?username=defect.dojo",
+            "name":"defect.dojo",
+            "key":"defect.dojo",
+            "avatarUrls":{
+                "48x48":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=48",
+                "24x24""https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=24",
+                "16x16":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=16",
+                "32x32":"https://www.gravatar.com/avatar/9637bfb970eff6176357df615f548f1c?d=mm&s=32"
             },
-            "created":"2021-01-10T10:12:47.824+0100",
-            "updated":"2021-01-10T10:12:47.824+0100"
-        }
-        }
+            "displayName":"Defect Dojo",
+            "active":true,
+            "timeZone":"Europe/Amsterdam"
+        },
+        "created":"2021-01-10T10:12:47.824+0100",
+        "updated":"2021-01-10T10:12:47.824+0100"
+    }
+    }
     """
     comment = parsed_json.get("comment", None)
     if comment is None:
diff --git a/dojo/management/commands/dedupe.py b/dojo/management/commands/dedupe.py
index 1e4ae0ec90..e17da18074 100644
--- a/dojo/management/commands/dedupe.py
+++ b/dojo/management/commands/dedupe.py
@@ -27,10 +27,12 @@ def generate_hash_code(f):
 
 
 class Command(BaseCommand):
+
     """
     Updates hash codes and/or runs deduplication for findings. Hashcode calculation always runs in the foreground, dedupe by default runs in the background.
     Usage: manage.py dedupe [--parser "Parser1 Scan" --parser "Parser2 Scan"...] [--hash_code_only] [--dedupe_only] [--dedupe_sync]'
     """
+
     help = 'Usage: manage.py dedupe [--parser "Parser1 Scan" --parser "Parser2 Scan"...] [--hash_code_only] [--dedupe_only] [--dedupe_sync]'
 
     def add_arguments(self, parser):
diff --git a/dojo/management/commands/import_github_languages.py b/dojo/management/commands/import_github_languages.py
index be83506a3e..09e1be8bd2 100644
--- a/dojo/management/commands/import_github_languages.py
+++ b/dojo/management/commands/import_github_languages.py
@@ -10,10 +10,12 @@
 
 
 class Command(BaseCommand):
+
     """
     GitHub maintains a wide range of languages with colors. The project https://github.com/ozh/github-colors
     converts them regularly in a json file, which we can use to update Language_Types
     """
+
     help = "Usage: manage.py migraimport_github_languages"
 
     def handle(self, *args, **options):
diff --git a/dojo/management/commands/initialize_permissions.py b/dojo/management/commands/initialize_permissions.py
index 81ac5d7eb6..33f067e31f 100644
--- a/dojo/management/commands/initialize_permissions.py
+++ b/dojo/management/commands/initialize_permissions.py
@@ -8,9 +8,9 @@
 
 
 class Command(BaseCommand):
-    """
-    This management command creates non-standard Django permissions
-    """
+
+    """This management command creates non-standard Django permissions"""
+
     help = "Usage: manage.py initialize_permissions"
 
     def handle(self, *args, **options):
diff --git a/dojo/management/commands/jira_status_reconciliation.py b/dojo/management/commands/jira_status_reconciliation.py
index e26aefc051..868f4492c4 100644
--- a/dojo/management/commands/jira_status_reconciliation.py
+++ b/dojo/management/commands/jira_status_reconciliation.py
@@ -190,6 +190,7 @@ def jira_status_reconciliation(*args, **kwargs):
 
 
 class Command(BaseCommand):
+
     """
     Reconcile finding status with JIRA issue status, stdout will contain semicolon seperated CSV results.
     Risk Accepted findings are skipped.'
diff --git a/dojo/management/commands/migrate_authorization_v2.py b/dojo/management/commands/migrate_authorization_v2.py
index cfcde52a2c..2344419ff5 100644
--- a/dojo/management/commands/migrate_authorization_v2.py
+++ b/dojo/management/commands/migrate_authorization_v2.py
@@ -6,12 +6,14 @@
 
 
 class Command(BaseCommand):
+
     """
     This management command migrated authorized users of product types and
     products to product type members and product members. Since the legacy
     authorization is removed from the code now, this management command is
     empty. It cannot be removed because it is called in a db migration.
     """
+
     help = "Usage: manage.py migration_authorization_v2"
 
     def handle(self, *args, **options):
diff --git a/dojo/management/commands/migrate_cve.py b/dojo/management/commands/migrate_cve.py
index 74a07325f2..bf0895ef0b 100644
--- a/dojo/management/commands/migrate_cve.py
+++ b/dojo/management/commands/migrate_cve.py
@@ -26,9 +26,8 @@ def create_vulnerability_id_template(finding_template):
 
 
 class Command(BaseCommand):
-    """
-    This management command creates vulnerability ids for all findings / findings_templates with cve's.
-    """
+
+    """This management command creates vulnerability ids for all findings / findings_templates with cve's."""
 
     help = "Usage: manage.py migrate_cve"
 
diff --git a/dojo/management/commands/migrate_staff_users.py b/dojo/management/commands/migrate_staff_users.py
index d7a08eeb1e..c862c0dee3 100644
--- a/dojo/management/commands/migrate_staff_users.py
+++ b/dojo/management/commands/migrate_staff_users.py
@@ -10,10 +10,12 @@
 
 
 class Command(BaseCommand):
+
     """
     This management command creates a group for staff users with all configuration
     permissions staff users had in previous releases.
     """
+
     help = "Usage: manage.py migrate_staff_users"
 
     def handle(self, *args, **options):
diff --git a/dojo/management/commands/migrate_textquestions.py b/dojo/management/commands/migrate_textquestions.py
index 5b559e2a1c..3e27223833 100644
--- a/dojo/management/commands/migrate_textquestions.py
+++ b/dojo/management/commands/migrate_textquestions.py
@@ -7,10 +7,12 @@
 
 
 class Command(BaseCommand):
+
     """
     Textquestions for surveys need to be modified after loading the fixture
     as they contain an instance dependant polymorphic content id
     """
+
     help = "Usage: manage.py migration_textquestions"
 
     def handle(self, *args, **options):
diff --git a/dojo/metrics/utils.py b/dojo/metrics/utils.py
index d22b13beb4..191c454b6e 100644
--- a/dojo/metrics/utils.py
+++ b/dojo/metrics/utils.py
@@ -250,35 +250,39 @@ def endpoint_queries(
 
 
 class _MetricsPeriodEntry(NamedTuple):
+
     """
     Class for holding information for a metrics period. Allows us to store a kwarg for date manipulation alongside a DB
     method used to aggregate around the same timeframe.
     """
+
     datetime_name: str
     db_method: Union[TruncWeek, TruncMonth]
 
 
 class MetricsPeriod(_MetricsPeriodEntry, Enum):
-    """
-    Enum for the two metrics periods supported: by week and month
-    """
+
+    """Enum for the two metrics periods supported: by week and month"""
+
     WEEK = ("weeks", TruncWeek)
     MONTH = ("months", TruncMonth)
 
 
 class _MetricsTypeEntry(NamedTuple):
+
     """
     Class for holding information for a metrics type. Allows us to store relative queryset lookups for severities
     alongside relative lookups for closed statuses.
     """
+
     severity_lookup: str
     closed_lookup: str
 
 
 class MetricsType(_MetricsTypeEntry, Enum):
-    """
-    Enum for the two metrics types supported: by Findings and by Endpoints (Endpoint_Status)
-    """
+
+    """Enum for the two metrics types supported: by Findings and by Endpoints (Endpoint_Status)"""
+
     FINDING = ("severity", "is_mitigated")
     ENDPOINT = ("finding__severity", "mitigated")
 
@@ -482,7 +486,6 @@ def aggregate_counts_by_period(
     :param include_closed: A boolean dictating whether 'closed' finding/status aggregates should be included
     :return: A queryset with aggregate severity counts grouped by period
     """
-
     desired_values = ("grouped_date", "critical", "high", "medium", "low", "info", "total")
 
     severities_by_period = severity_count(
diff --git a/dojo/middleware.py b/dojo/middleware.py
index 2a892a9e9c..29eff445b3 100644
--- a/dojo/middleware.py
+++ b/dojo/middleware.py
@@ -19,6 +19,7 @@
 
 
 class LoginRequiredMiddleware:
+
     """
     Middleware that requires a user to be authenticated to view any page other
     than LOGIN_URL. Exemptions to this requirement can optionally be specified
@@ -133,6 +134,7 @@ def get(self, no_cache=False, *args, **kwargs):
 
 
 class APITrailingSlashMiddleware:
+
     """
     Middleware that will send a more informative error response to POST requests
     made without the trailing slash. When this middleware is not active, POST requests
@@ -156,9 +158,8 @@ def __call__(self, request):
 
 
 class AdditionalHeaderMiddleware:
-    """
-    Middleware that will add an arbitray amount of HTTP Request headers toall requests.
-    """
+
+    """Middleware that will add an arbitray amount of HTTP Request headers toall requests."""
 
     def __init__(self, get_response):
 
diff --git a/dojo/models.py b/dojo/models.py
index 2346c1e916..a5479e2a5c 100644
--- a/dojo/models.py
+++ b/dojo/models.py
@@ -125,6 +125,7 @@ def _manage_inherited_tags(obj, incoming_inherited_tags, potentially_existing_ta
 
 @deconstructible
 class UniqueUploadNameProvider:
+
     """
     A callable to be passed as upload_to parameter to FileField.
 
@@ -215,9 +216,7 @@ def enable_force_password_reset(user):
 
     @staticmethod
     def generate_full_name(user):
-        """
-        Returns the first_name plus the last_name, with a space in between.
-        """
+        """Returns the first_name plus the last_name, with a space in between."""
         full_name = f"{user.first_name} {user.last_name} ({user.username})"
         return full_name.strip()
 
@@ -736,14 +735,17 @@ def get_accessible_url(self, obj, obj_id):
 
 
 class Product_Type(models.Model):
-    """Product types represent the top level model, these can be business unit divisions, different offices or locations, development teams, or any other logical way of distinguishing “types” of products.
-`
+
+    """
+    Product types represent the top level model, these can be business unit divisions, different offices or locations, development teams, or any other logical way of distinguishing “types” of products.
+    `
        Examples:
          * IAM Team
          * Internal / 3rd Party
          * Main company / Acquisition
          * San Francisco / New York offices
     """
+
     name = models.CharField(max_length=255, unique=True)
     description = models.CharField(max_length=4000, null=True, blank=True)
     critical_product = models.BooleanField(default=False)
@@ -2175,7 +2177,7 @@ def delete(self, *args, **kwargs):
 
     @property
     def statistics(self):
-        """ Queries the database, no prefetching, so could be slow for lists of model instances """
+        """Queries the database, no prefetching, so could be slow for lists of model instances"""
         return _get_statistics_for_queryset(Finding.objects.filter(test=self), _get_annotations_for_statistics)
 
     def inherit_tags(self, potentially_existing_tags):
@@ -2221,7 +2223,7 @@ def __str__(self):
 
     @property
     def statistics(self):
-        """ Queries the database, no prefetching, so could be slow for lists of model instances """
+        """Queries the database, no prefetching, so could be slow for lists of model instances"""
         stats = {}
         for action in IMPORT_ACTIONS:
             stats[action[1].lower()] = _get_statistics_for_queryset(Finding.objects.filter(test_import_finding_action__test_import=self, test_import_finding_action__action=action[0]), _get_annotations_for_statistics)
@@ -3701,9 +3703,13 @@ def copy(self, engagement=None):
 
 
 class FileAccessToken(models.Model):
-    """This will allow reports to request the images without exposing the
+
+    """
+    This will allow reports to request the images without exposing the
     media root to the world without
-    authentication"""
+    authentication
+    """
+
     user = models.ForeignKey(Dojo_User, null=False, blank=False, on_delete=models.CASCADE)
     file = models.ForeignKey(FileUpload, null=False, blank=False, on_delete=models.CASCADE)
     token = models.CharField(max_length=255)
@@ -4402,9 +4408,8 @@ def __str__(self):
 # ==============================
 with warnings.catch_warnings(action="ignore", category=ManagerInheritanceWarning):
     class Question(PolymorphicModel, TimeStampedModel):
-        """
-            Represents a question.
-        """
+
+        """Represents a question."""
 
         class Meta:
             ordering = ["order"]
@@ -4425,23 +4430,20 @@ def __str__(self):
 
 
 class TextQuestion(Question):
-    """
-    Question with a text answer
-    """
+
+    """Question with a text answer"""
+
     objects = PolymorphicManager()
 
     def get_form(self):
-        """
-        Returns the form for this model
-        """
+        """Returns the form for this model"""
         from .forms import TextQuestionForm
         return TextQuestionForm
 
 
 class Choice(TimeStampedModel):
-    """
-    Model to store the choices for multi choice questions
-    """
+
+    """Model to store the choices for multi choice questions"""
 
     order = models.PositiveIntegerField(default=1)
 
@@ -4455,6 +4457,7 @@ def __str__(self):
 
 
 class ChoiceQuestion(Question):
+
     """
     Question with answers that are chosen from a list of choices defined
     by the user.
@@ -4466,10 +4469,7 @@ class ChoiceQuestion(Question):
     objects = PolymorphicManager()
 
     def get_form(self):
-        """
-        Returns the form for this model
-        """
-
+        """Returns the form for this model"""
         from .forms import ChoiceQuestionForm
         return ChoiceQuestionForm
 
@@ -4534,8 +4534,9 @@ def __str__(self):
 
 with warnings.catch_warnings(action="ignore", category=ManagerInheritanceWarning):
     class Answer(PolymorphicModel, TimeStampedModel):
-        """ Base Answer model
-        """
+
+        """Base Answer model"""
+
         question = models.ForeignKey(Question, on_delete=models.CASCADE)
 
         answered_survey = models.ForeignKey(Answered_Survey,
diff --git a/dojo/request_cache/middleware.py b/dojo/request_cache/middleware.py
index 9904718f7c..9269c1492c 100644
--- a/dojo/request_cache/middleware.py
+++ b/dojo/request_cache/middleware.py
@@ -18,6 +18,7 @@
 
 
 class RequestCache(LocMemCache):
+
     """
     RequestCache is a customized LocMemCache which stores its data cache as an instance attribute, rather than
     a global. It's designed to live only as long as the request object that RequestCacheMiddleware attaches it to.
@@ -34,6 +35,7 @@ def __init__(self):
 
 
 class RequestCacheMiddleware(MiddlewareMixin):
+
     """
     For every request, a fresh cache instance is stored in ``request.cache``.
     The cache instance lives only as long as request does.
diff --git a/dojo/risk_acceptance/helper.py b/dojo/risk_acceptance/helper.py
index 1cd1b15cda..00897d134c 100644
--- a/dojo/risk_acceptance/helper.py
+++ b/dojo/risk_acceptance/helper.py
@@ -160,7 +160,6 @@ def expiration_handler(*args, **kwargs):
     If configured also sends a JIRA comment in both case to each jira issue.
     This is per finding.
     """
-
     try:
         system_settings = System_Settings.objects.get()
     except System_Settings.DoesNotExist:
diff --git a/dojo/search/views.py b/dojo/search/views.py
index 604e9ecd68..c8c7eb2127 100644
--- a/dojo/search/views.py
+++ b/dojo/search/views.py
@@ -31,7 +31,6 @@
 
 
 def simple_search(request):
-
     """
     query:     some keywords
     operators: {}
@@ -69,7 +68,6 @@ def simple_search(request):
     operators: {'tags': ['anchore'], 'vulnerability_id': ['CVE-2020-1234']}
     keywords:  ['jquery']
     """
-
     tests = None
     findings = None
     finding_templates = None
diff --git a/dojo/test/views.py b/dojo/test/views.py
index b93ebe1293..96d3a58c1e 100644
--- a/dojo/test/views.py
+++ b/dojo/test/views.py
@@ -808,9 +808,7 @@ def search(request, tid):
 
 class ReImportScanResultsView(View):
     def get_template(self) -> str:
-        """
-        Returns the template that will be presented to the user
-        """
+        """Returns the template that will be presented to the user"""
         return "dojo/import_scan_results.html"
 
     def get_form(
@@ -819,9 +817,7 @@ def get_form(
         test: Test,
         **kwargs: dict,
     ) -> ReImportScanForm:
-        """
-        Returns the default import form for importing findings
-        """
+        """Returns the default import form for importing findings"""
         if request.method == "POST":
             return ReImportScanForm(request.POST, request.FILES, test=test, **kwargs)
         return ReImportScanForm(test=test, **kwargs)
@@ -831,9 +827,7 @@ def get_jira_form(
         request: HttpRequest,
         test: Test,
     ) -> Tuple[JIRAImportScanForm | None, bool]:
-        """
-        Returns a JiraImportScanForm if jira is enabled
-        """
+        """Returns a JiraImportScanForm if jira is enabled"""
         jira_form = None
         push_all_jira_issues = False
         # Decide if we need to present the Push to JIRA form
@@ -926,9 +920,7 @@ def process_form(
         form: ReImportScanForm,
         context: dict,
     ) -> str | None:
-        """
-        Process the form and manipulate the input in any way that is appropriate
-        """
+        """Process the form and manipulate the input in any way that is appropriate"""
         # Update the running context dict with cleaned form input
         context.update({
             "scan": request.FILES.get("file", None),
@@ -984,18 +976,14 @@ def get_reimporter(
         self,
         context: dict,
     ) -> BaseImporter:
-        """
-        Gets the reimporter to use
-        """
+        """Gets the reimporter to use"""
         return DefaultReImporter(**context)
 
     def reimport_findings(
         self,
         context: dict,
     ) -> str | None:
-        """
-        Attempt to import with all the supplied information
-        """
+        """Attempt to import with all the supplied information"""
         try:
             importer_client = self.get_reimporter(context)
             (
@@ -1026,18 +1014,14 @@ def success_redirect(
         self,
         context: dict,
     ) -> HttpResponseRedirect:
-        """
-        Redirect the user to a place that indicates a successful import
-        """
+        """Redirect the user to a place that indicates a successful import"""
         return HttpResponseRedirect(reverse("view_test", args=(context.get("test").id, )))
 
     def failure_redirect(
         self,
         context: dict,
     ) -> HttpResponseRedirect:
-        """
-        Redirect the user to a place that indicates a failed import
-        """
+        """Redirect the user to a place that indicates a failed import"""
         return HttpResponseRedirect(reverse(
             "re_import_scan_results",
             args=(context.get("test").id, ),
@@ -1048,9 +1032,7 @@ def get(
         request: HttpRequest,
         test_id: int,
     ) -> HttpResponse:
-        """
-        Process GET requests for the ReImport View
-        """
+        """Process GET requests for the ReImport View"""
         # process the request and path parameters
         request, context = self.handle_request(
             request,
@@ -1064,9 +1046,7 @@ def post(
         request: HttpRequest,
         test_id: int,
     ) -> HttpResponse:
-        """
-        Process POST requests for the ReImport View
-        """
+        """Process POST requests for the ReImport View"""
         # process the request and path parameters
         request, context = self.handle_request(
             request,
diff --git a/dojo/tools/acunetix/parse_acunetix360_json.py b/dojo/tools/acunetix/parse_acunetix360_json.py
index fcff232a55..082bf889a6 100644
--- a/dojo/tools/acunetix/parse_acunetix360_json.py
+++ b/dojo/tools/acunetix/parse_acunetix360_json.py
@@ -8,7 +8,9 @@
 
 
 class AcunetixJSONParser:
+
     """This parser is written for Acunetix JSON Findings."""
+
     def get_findings(self, filename, test):
         dupes = {}
         data = json.load(filename)
diff --git a/dojo/tools/acunetix/parse_acunetix_xml.py b/dojo/tools/acunetix/parse_acunetix_xml.py
index 4b86d94731..eb1e64d16a 100644
--- a/dojo/tools/acunetix/parse_acunetix_xml.py
+++ b/dojo/tools/acunetix/parse_acunetix_xml.py
@@ -13,7 +13,9 @@
 
 
 class AcunetixXMLParser:
+
     """This parser is written for Acunetix XML reports"""
+
     def get_findings(self, filename, test):
         dupes = {}
         root = parse(filename).getroot()
diff --git a/dojo/tools/acunetix/parser.py b/dojo/tools/acunetix/parser.py
index 789fc23607..a85ca82af5 100644
--- a/dojo/tools/acunetix/parser.py
+++ b/dojo/tools/acunetix/parser.py
@@ -3,6 +3,7 @@
 
 
 class AcunetixParser:
+
     """Parser for Acunetix XML files and Acunetix 360 JSON files."""
 
     def get_scan_types(self):
diff --git a/dojo/tools/anchore_grype/parser.py b/dojo/tools/anchore_grype/parser.py
index 48e18b686e..94a0ac5971 100644
--- a/dojo/tools/anchore_grype/parser.py
+++ b/dojo/tools/anchore_grype/parser.py
@@ -7,7 +7,9 @@
 
 
 class AnchoreGrypeParser:
-    """Anchore Grype JSON report format generated with `-o json` option.
+
+    """
+    Anchore Grype JSON report format generated with `-o json` option.
 
     command: `grype defectdojo/defectdojo-django:1.13.1 -o json > many_vulns.json`
     """
diff --git a/dojo/tools/api_blackduck/api_client.py b/dojo/tools/api_blackduck/api_client.py
index b354f85d75..ea4a7999f2 100644
--- a/dojo/tools/api_blackduck/api_client.py
+++ b/dojo/tools/api_blackduck/api_client.py
@@ -2,9 +2,8 @@
 
 
 class BlackduckAPI:
-    """
-    A simple client for the BlackDuck API
-    """
+
+    """A simple client for the BlackDuck API"""
 
     def __init__(self, tool_config):
         if tool_config.authentication_type == "API":
diff --git a/dojo/tools/api_blackduck/importer.py b/dojo/tools/api_blackduck/importer.py
index c2606cd0af..d869ebc10c 100644
--- a/dojo/tools/api_blackduck/importer.py
+++ b/dojo/tools/api_blackduck/importer.py
@@ -6,9 +6,8 @@
 
 
 class BlackduckApiImporter:
-    """
-    Import from BlackDuck API
-    """
+
+    """Import from BlackDuck API"""
 
     config_id = "BlackDuck API"
 
diff --git a/dojo/tools/api_blackduck/parser.py b/dojo/tools/api_blackduck/parser.py
index ccd228c89c..5c01062e51 100644
--- a/dojo/tools/api_blackduck/parser.py
+++ b/dojo/tools/api_blackduck/parser.py
@@ -8,9 +8,8 @@
 
 
 class ApiBlackduckParser:
-    """
-    Import from Synopsys BlackDuck API /findings
-    """
+
+    """Import from Synopsys BlackDuck API /findings"""
 
     def get_scan_types(self):
         return [SCAN_TYPE_ID]
diff --git a/dojo/tools/api_bugcrowd/api_client.py b/dojo/tools/api_bugcrowd/api_client.py
index 68e73367d1..f180d64325 100644
--- a/dojo/tools/api_bugcrowd/api_client.py
+++ b/dojo/tools/api_bugcrowd/api_client.py
@@ -4,9 +4,8 @@
 
 
 class BugcrowdAPI:
-    """
-    A simple client for the bugcrowd.io API
-    """
+
+    """A simple client for the bugcrowd.io API"""
 
     bugcrowd_api_url = "https://api.bugcrowd.com"
     default_headers = {
diff --git a/dojo/tools/api_bugcrowd/importer.py b/dojo/tools/api_bugcrowd/importer.py
index 4fb1219cb3..e47dba8a40 100644
--- a/dojo/tools/api_bugcrowd/importer.py
+++ b/dojo/tools/api_bugcrowd/importer.py
@@ -10,9 +10,8 @@
 
 
 class BugcrowdApiImporter:
-    """
-    Import from Bugcrowd API
-    """
+
+    """Import from Bugcrowd API"""
 
     def get_findings(self, test):
         client, config = self.prepare_client(test)
diff --git a/dojo/tools/api_bugcrowd/parser.py b/dojo/tools/api_bugcrowd/parser.py
index bbff76ef4b..da06880fd2 100644
--- a/dojo/tools/api_bugcrowd/parser.py
+++ b/dojo/tools/api_bugcrowd/parser.py
@@ -19,9 +19,8 @@
 
 
 class ApiBugcrowdParser:
-    """
-    Import from Bugcrowd API /submissions
-    """
+
+    """Import from Bugcrowd API /submissions"""
 
     def get_scan_types(self):
         return [SCAN_BUGCROWD_API]
diff --git a/dojo/tools/api_cobalt/api_client.py b/dojo/tools/api_cobalt/api_client.py
index 0161715c73..21318143e2 100644
--- a/dojo/tools/api_cobalt/api_client.py
+++ b/dojo/tools/api_cobalt/api_client.py
@@ -2,9 +2,8 @@
 
 
 class CobaltAPI:
-    """
-    A simple client for the Cobalt.io API
-    """
+
+    """A simple client for the Cobalt.io API"""
 
     cobalt_api_url = "https://api.cobalt.io"
 
diff --git a/dojo/tools/api_cobalt/importer.py b/dojo/tools/api_cobalt/importer.py
index 8c74c6c8cf..12616282f1 100644
--- a/dojo/tools/api_cobalt/importer.py
+++ b/dojo/tools/api_cobalt/importer.py
@@ -10,9 +10,8 @@
 
 
 class CobaltApiImporter:
-    """
-    Import from Cobalt.io API
-    """
+
+    """Import from Cobalt.io API"""
 
     def get_findings(self, test):
         client, config = self.prepare_client(test)
diff --git a/dojo/tools/api_cobalt/parser.py b/dojo/tools/api_cobalt/parser.py
index 5ec50de6c4..b6f119b07b 100644
--- a/dojo/tools/api_cobalt/parser.py
+++ b/dojo/tools/api_cobalt/parser.py
@@ -10,9 +10,8 @@
 
 
 class ApiCobaltParser:
-    """
-    Import from Cobalt.io API /findings
-    """
+
+    """Import from Cobalt.io API /findings"""
 
     def get_scan_types(self):
         return [SCAN_COBALTIO_API]
diff --git a/dojo/tools/api_edgescan/api_client.py b/dojo/tools/api_edgescan/api_client.py
index c7fdc73517..df0de92a47 100644
--- a/dojo/tools/api_edgescan/api_client.py
+++ b/dojo/tools/api_edgescan/api_client.py
@@ -5,9 +5,8 @@
 
 
 class EdgescanAPI:
-    """
-    A simple client for the Edgescan API
-    """
+
+    """A simple client for the Edgescan API"""
 
     DEFAULT_URL = "https://live.edgescan.com"
 
diff --git a/dojo/tools/api_edgescan/importer.py b/dojo/tools/api_edgescan/importer.py
index 6d1ca4de90..3aae417f91 100644
--- a/dojo/tools/api_edgescan/importer.py
+++ b/dojo/tools/api_edgescan/importer.py
@@ -6,9 +6,8 @@
 
 
 class EdgescanImporter:
-    """
-    Import from Edgescan API
-    """
+
+    """Import from Edgescan API"""
 
     def get_findings(self, test):
         client, config = self.prepare_client(test)
diff --git a/dojo/tools/api_edgescan/parser.py b/dojo/tools/api_edgescan/parser.py
index 66b00f9246..3fe8656191 100644
--- a/dojo/tools/api_edgescan/parser.py
+++ b/dojo/tools/api_edgescan/parser.py
@@ -11,9 +11,8 @@
 
 
 class ApiEdgescanParser:
-    """
-    Import from Edgescan API or JSON file
-    """
+
+    """Import from Edgescan API or JSON file"""
 
     def get_scan_types(self):
         return [SCANTYPE_EDGESCAN]
diff --git a/dojo/tools/api_sonarqube/api_client.py b/dojo/tools/api_sonarqube/api_client.py
index e42150f641..9dd512efe9 100644
--- a/dojo/tools/api_sonarqube/api_client.py
+++ b/dojo/tools/api_sonarqube/api_client.py
@@ -147,7 +147,6 @@ def find_issues(
         :param types: issue types (comma separated values). e.g. BUG,VULNERABILITY,CODE_SMELL
         :return:
         """
-
         if self.extras is not None:
             types = self.extras
 
@@ -388,9 +387,7 @@ def add_comment(self, issue_key, text):
             raise Exception(msg)
 
     def test_connection(self):
-        """
-        Returns number of components (projects) or raise error.
-        """
+        """Returns number of components (projects) or raise error."""
         parameters = {"qualifiers": "TRK"}
 
         if self.org_id is not None:
diff --git a/dojo/tools/api_sonarqube/importer.py b/dojo/tools/api_sonarqube/importer.py
index 7e5856707d..77801de0e2 100644
--- a/dojo/tools/api_sonarqube/importer.py
+++ b/dojo/tools/api_sonarqube/importer.py
@@ -16,6 +16,7 @@
 
 
 class SonarQubeApiImporter:
+
     """
     This class imports from SonarQube (SQ) all open/confirmed SQ issues related to the project related to the test as
      findings.
diff --git a/dojo/tools/api_sonarqube/updater.py b/dojo/tools/api_sonarqube/updater.py
index c8bcd7e066..22248f1f9d 100644
--- a/dojo/tools/api_sonarqube/updater.py
+++ b/dojo/tools/api_sonarqube/updater.py
@@ -9,6 +9,7 @@
 
 
 class SonarQubeApiUpdater:
+
     """
     This class updates in SonarQube, a SonarQube issue previously imported as a DefectDojo Findings.
      This class maps the finding status to a SQ issue status and later on it transitions the issue
diff --git a/dojo/tools/api_sonarqube/updater_from_source.py b/dojo/tools/api_sonarqube/updater_from_source.py
index 93afa04c4a..74c92c8dd7 100644
--- a/dojo/tools/api_sonarqube/updater_from_source.py
+++ b/dojo/tools/api_sonarqube/updater_from_source.py
@@ -11,6 +11,7 @@
 
 
 class SonarQubeApiUpdaterFromSource:
+
     """
     The responsibility of this class is to update the Finding status if current SonarQube issue status doesn't match.
 
diff --git a/dojo/tools/api_vulners/api_client.py b/dojo/tools/api_vulners/api_client.py
index 0213e55e61..72a8636bed 100644
--- a/dojo/tools/api_vulners/api_client.py
+++ b/dojo/tools/api_vulners/api_client.py
@@ -2,9 +2,8 @@
 
 
 class VulnersAPI:
-    """
-    A simple client for the Vulners API
-    """
+
+    """A simple client for the Vulners API"""
 
     vulners_api_url = None
     api_key = None
diff --git a/dojo/tools/api_vulners/importer.py b/dojo/tools/api_vulners/importer.py
index 0b49306f7e..358fc9980c 100644
--- a/dojo/tools/api_vulners/importer.py
+++ b/dojo/tools/api_vulners/importer.py
@@ -10,9 +10,8 @@
 
 
 class VulnersImporter:
-    """
-    Import from Vulners API
-    """
+
+    """Import from Vulners API"""
 
     def get_findings(self, test):
         client, _config = self.prepare_client(test)
diff --git a/dojo/tools/api_vulners/parser.py b/dojo/tools/api_vulners/parser.py
index 5d6382caaf..fe9ec24219 100644
--- a/dojo/tools/api_vulners/parser.py
+++ b/dojo/tools/api_vulners/parser.py
@@ -20,6 +20,7 @@
 
 
 class ApiVulnersParser:
+
     """Parser that can load data from Vulners Scanner API"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py b/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
index ba29a780bc..6d10485e4d 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
@@ -6,12 +6,14 @@
 
 
 class AppCheckScanningEngineParser(BaseEngineParser):
+
     """
     Parser for data from the (proprietary?) AppCheck scanning engine.
 
     Results from this engine may include request/response data nested in the 'details' entry. This extracts those values
     and stores them in the Finding unsaved_request/unsaved_response attributes.
     """
+
     SCANNING_ENGINE = "NewAppCheckScannerMultiple"
 
     HTTP_1_REQUEST_RESPONSE_PATTERN = re.compile(r"^--->\n\n(.+)\n\n<---\n\n(.+)$", re.DOTALL)
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/base.py b/dojo/tools/appcheck_web_application_scanner/engines/base.py
index f45fd50669..782c047443 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/base.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/base.py
@@ -19,9 +19,7 @@
 
 
 def strip_markup(value: str) -> str:
-    """
-    Strips out "markup" from value
-    """
+    """Strips out "markup" from value"""
     if value:
         return MARKUP_STRIPPING_PATTERN.sub("", value).strip()
     return value
@@ -75,6 +73,7 @@ def cvss_score_to_severity(score: float, version: int) -> str:
 # Field parsing helper classes
 #######
 class FieldType:
+
     """
     Base class for attribute handlers for parsers. Callable, and calls the .handle() method, which should be implemented
     by subclasses.
@@ -83,6 +82,7 @@ class FieldType:
     subclasses should check whether the configuration for this object makes sense (or as much sense as can be determined
     when the method is called) and raise an ImproperlyConfigured exception if it does not.
     """
+
     def __init__(self, target_name):
         self.target_name = target_name
 
@@ -97,10 +97,12 @@ def check(self, engine_parser):
 
 
 class Attribute(FieldType):
+
     """
     Class for a field that maps directly from one in the input data to a Finding attribute. Initialized with a Finding
     attribute name, when called sets the value of that attribute to the passed-in value.
     """
+
     def handle(self, engine_class, finding, value):
         setattr(finding, self.target_name, value)
 
@@ -111,19 +113,21 @@ def check(self, engine_parser):
 
 
 class DeMarkupedAttribute(Attribute):
-    """
-    Class for an Attribute (as above) but whose value is stripped of markup and non-printable chars prior to being set.
-    """
+
+    """Class for an Attribute (as above) but whose value is stripped of markup and non-printable chars prior to being set."""
+
     def handle(self, engine_class, finding, value):
         super().handle(engine_class, finding, escape_non_printable(strip_markup(value)))
 
 
 class Method(FieldType):
+
     """
     Class for a field that requires a method to process it. Initialized with a method name, when called it invokes the
     method on the passed-in engine parser, passing in a Finding and value. It's expected that the method will update
     the Finding as it sees fit (i.e., this class does not modify the Finding)
     """
+
     def handle(self, engine_parser, finding, value):
         getattr(engine_parser, self.target_name)(finding, value)
 
@@ -134,6 +138,7 @@ def check(self, engine_parser):
 
 
 class BaseEngineParser:
+
     """
     Parser for data shared by all engines used by AppCheck, as well as data from an unknown/unspecified engine.
 
@@ -158,6 +163,7 @@ class BaseEngineParser:
     Child classes can override the _ENGINE_FIELDS_MAP dictionary to support extended/different functionality as so
     desired, without having to change/copy the common field parsing described above.
     """
+
     SCANNING_ENGINE = "Unknown"
 
     # Field handling common to all findings returned by AppCheck
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/nmap.py b/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
index a5633ae11f..9252bdcb53 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
@@ -5,12 +5,14 @@
 
 
 class NmapScanningEngineParser(BaseEngineParser):
+
     """
     Parser for data from the Nmap scanning engine.
 
     Nmap engine results include a list of ports in a 'port_table' data entry that we use to generate several endpoints
     under the same Finding.
     """
+
     SCANNING_ENGINE = "NMapScanner"
 
     def is_port_table_entry(self, entry) -> bool:
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/openvas.py b/dojo/tools/appcheck_web_application_scanner/engines/openvas.py
index a87a4842a8..21dcdf62b6 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/openvas.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/openvas.py
@@ -2,9 +2,11 @@
 
 
 class OpenVASScannerEngineParser(BaseEngineParser):
+
     """
     Parser for data from the OpenVAS scanning engine.
 
     Shares all functionality with BaseEngineParser, but registered under an explicit name.
     """
+
     SCANNING_ENGINE = "OpenVASScanner"
diff --git a/dojo/tools/appcheck_web_application_scanner/parser.py b/dojo/tools/appcheck_web_application_scanner/parser.py
index 47356bd404..485d879e5b 100644
--- a/dojo/tools/appcheck_web_application_scanner/parser.py
+++ b/dojo/tools/appcheck_web_application_scanner/parser.py
@@ -18,6 +18,7 @@
 
 
 class AppCheckWebApplicationScannerParser:
+
     """
     AppCheck Web Application Security Scanner.
 
diff --git a/dojo/tools/appspider/parser.py b/dojo/tools/appspider/parser.py
index d6ccf54611..7263a393e4 100644
--- a/dojo/tools/appspider/parser.py
+++ b/dojo/tools/appspider/parser.py
@@ -5,6 +5,7 @@
 
 
 class AppSpiderParser:
+
     """Parser for Rapid7 AppSpider reports"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/arachni/parser.py b/dojo/tools/arachni/parser.py
index 7b28d7e9f0..3823da0589 100644
--- a/dojo/tools/arachni/parser.py
+++ b/dojo/tools/arachni/parser.py
@@ -8,7 +8,9 @@
 
 
 class ArachniParser:
-    """Arachni Web Scanner (http://arachni-scanner.com/wiki)
+
+    """
+    Arachni Web Scanner (http://arachni-scanner.com/wiki)
 
     Reports are generated with arachni_reporter tool:
     `./arachni_reporter --reporter 'json' js.com.afr`
diff --git a/dojo/tools/auditjs/parser.py b/dojo/tools/auditjs/parser.py
index 6299308f79..c3e9da0bd8 100644
--- a/dojo/tools/auditjs/parser.py
+++ b/dojo/tools/auditjs/parser.py
@@ -9,6 +9,7 @@
 
 
 class AuditJSParser:
+
     """Parser for AuditJS Scan tool"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/bearer_cli/parser.py b/dojo/tools/bearer_cli/parser.py
index 6484fd6626..a7b4eba4f2 100644
--- a/dojo/tools/bearer_cli/parser.py
+++ b/dojo/tools/bearer_cli/parser.py
@@ -4,9 +4,8 @@
 
 
 class BearerCLIParser:
-    """
-    Bearer CLI tool is a SAST scanner for multiple languages
-    """
+
+    """Bearer CLI tool is a SAST scanner for multiple languages"""
 
     def get_scan_types(self):
         return ["Bearer CLI"]
diff --git a/dojo/tools/blackduck/importer.py b/dojo/tools/blackduck/importer.py
index 80db271449..8317537170 100644
--- a/dojo/tools/blackduck/importer.py
+++ b/dojo/tools/blackduck/importer.py
@@ -68,9 +68,7 @@ def _process_zipfile(self, report):
     def _process_project_findings(
         self, project_ids, security_issues, files=None,
     ):
-        """
-        Process findings per projects and return a BlackduckFinding object per the model
-        """
+        """Process findings per projects and return a BlackduckFinding object per the model"""
         for project_id in project_ids:
             locations = set()
             if files is not None:
diff --git a/dojo/tools/blackduck/parser.py b/dojo/tools/blackduck/parser.py
index 39e75e5e8e..a6a127fcdb 100644
--- a/dojo/tools/blackduck/parser.py
+++ b/dojo/tools/blackduck/parser.py
@@ -6,6 +6,7 @@
 
 
 class BlackduckParser:
+
     """
     Can import as exported from Blackduck:
     - from a zip file containing a security.csv and files.csv
diff --git a/dojo/tools/blackduck_binary_analysis/importer.py b/dojo/tools/blackduck_binary_analysis/importer.py
index 4b34042fed..4d381aae05 100644
--- a/dojo/tools/blackduck_binary_analysis/importer.py
+++ b/dojo/tools/blackduck_binary_analysis/importer.py
@@ -23,9 +23,7 @@ def parse_findings(self, report: Path) -> Iterable[BlackduckBinaryAnalysisFindin
         return self._process_csvfile(report, orig_report_name)
 
     def _process_csvfile(self, report, orig_report_name):
-        """
-        If passed a CSV file, process.
-        """
+        """If passed a CSV file, process."""
         vulnerabilities = {}
         with open(str(report), encoding="utf-8") as f:
             vulnerabilities = self.__partition_by_key(f)
@@ -38,9 +36,7 @@ def _process_csvfile(self, report, orig_report_name):
     def _process_vuln_results(
         self, sha1_hash_keys, report, orig_report_name, vulnerabilities,
     ):
-        """
-        Process findings for each project.
-        """
+        """Process findings for each project."""
         for sha1_hash_key in sha1_hash_keys:
             for vuln in vulnerabilities[sha1_hash_key]:
                 vuln_dict = dict(vuln)
diff --git a/dojo/tools/blackduck_binary_analysis/parser.py b/dojo/tools/blackduck_binary_analysis/parser.py
index faf070a56a..77f9647fc6 100644
--- a/dojo/tools/blackduck_binary_analysis/parser.py
+++ b/dojo/tools/blackduck_binary_analysis/parser.py
@@ -8,6 +8,7 @@
 
 
 class BlackduckBinaryAnalysisParser:
+
     """
     Report type(s) from Blackduck Binary Analysis compatible with DefectDojo:
     - Single CSV file containing vulnerable components
diff --git a/dojo/tools/blackduck_component_risk/importer.py b/dojo/tools/blackduck_component_risk/importer.py
index c33fa7fd67..fb35be926d 100644
--- a/dojo/tools/blackduck_component_risk/importer.py
+++ b/dojo/tools/blackduck_component_risk/importer.py
@@ -8,6 +8,7 @@
 
 
 class BlackduckCRImporter:
+
     """
     Importer for blackduck. V3 is different in that it creates a Finding in defect dojo
     for each vulnerable component version used in a project, for each license that is
diff --git a/dojo/tools/blackduck_component_risk/parser.py b/dojo/tools/blackduck_component_risk/parser.py
index 270b348172..76db65191a 100644
--- a/dojo/tools/blackduck_component_risk/parser.py
+++ b/dojo/tools/blackduck_component_risk/parser.py
@@ -5,6 +5,7 @@
 
 
 class BlackduckComponentRiskParser:
+
     """
     Can import as exported from Blackduck:
     - from a zip file containing a security.csv, sources.csv and components.csv
diff --git a/dojo/tools/burp/parser.py b/dojo/tools/burp/parser.py
index 1edfdf0b0e..f50bbaa358 100644
--- a/dojo/tools/burp/parser.py
+++ b/dojo/tools/burp/parser.py
@@ -11,6 +11,7 @@
 
 
 class BurpParser:
+
     """
     The objective of this class is to parse an xml file generated by the burp tool.
 
diff --git a/dojo/tools/burp_api/parser.py b/dojo/tools/burp_api/parser.py
index c54726f384..be25f82497 100644
--- a/dojo/tools/burp_api/parser.py
+++ b/dojo/tools/burp_api/parser.py
@@ -16,6 +16,7 @@
 
 
 class BurpApiParser:
+
     """Parser that can load data from Burp API"""
 
     def get_scan_types(self):
@@ -123,7 +124,8 @@ def get_clean_base64(self, value):
 
 
 def convert_severity(issue):
-    """According to OpenAPI definition of the API
+    """
+    According to OpenAPI definition of the API
 
     "Severity":{
              "type":"string",
@@ -144,7 +146,8 @@ def convert_severity(issue):
 
 
 def convert_confidence(issue):
-    """According to OpenAPI definition:
+    """
+    According to OpenAPI definition:
 
     "Confidence":{
              "type":"string",
diff --git a/dojo/tools/cargo_audit/parser.py b/dojo/tools/cargo_audit/parser.py
index 1447bf5908..d85d2e0d54 100644
--- a/dojo/tools/cargo_audit/parser.py
+++ b/dojo/tools/cargo_audit/parser.py
@@ -5,9 +5,8 @@
 
 
 class CargoAuditParser:
-    """
-    A class that can be used to parse the cargo audit JSON report file
-    """
+
+    """A class that can be used to parse the cargo audit JSON report file"""
 
     def get_scan_types(self):
         return ["CargoAudit Scan"]
diff --git a/dojo/tools/checkmarx/parser.py b/dojo/tools/checkmarx/parser.py
index c278612344..0d5607f509 100644
--- a/dojo/tools/checkmarx/parser.py
+++ b/dojo/tools/checkmarx/parser.py
@@ -129,7 +129,8 @@ def _process_result_file_name_aggregated(
         result,
         find_date,
     ):
-        """Process one result = one pathId for default "Checkmarx Scan"
+        """
+        Process one result = one pathId for default "Checkmarx Scan"
         Create the finding and add it into the dupes list
         If a vuln with the same file_path was found before, updates the description
         """
@@ -226,7 +227,8 @@ def get_description_file_name_aggregated(self, query, result):
     def _process_result_detailed(
         self, test, dupes, findingdetail, query, result, find_date,
     ):
-        """Process one result = one pathId for scanner "Checkmarx Scan detailed"
+        """
+        Process one result = one pathId for scanner "Checkmarx Scan detailed"
         Create the finding and add it into the dupes list
         """
         name, cwe, categories, queryId = self.getQueryElements(query)
diff --git a/dojo/tools/checkov/parser.py b/dojo/tools/checkov/parser.py
index 5628e53576..dc10c6e9bc 100644
--- a/dojo/tools/checkov/parser.py
+++ b/dojo/tools/checkov/parser.py
@@ -24,7 +24,8 @@ def get_findings(self, json_output, test):
         return findings
 
     def parse_json(self, json_output):
-        """Parse JSON report.
+        """
+        Parse JSON report.
         Checkov may return only one `check_type` (where the report is just a JSON)
         or more (where the report is an array of JSONs).
         To address all scenarios we force this method to return a list of JSON objects.
diff --git a/dojo/tools/cloudsploit/parser.py b/dojo/tools/cloudsploit/parser.py
index ccf3181aa1..14f5a080b8 100644
--- a/dojo/tools/cloudsploit/parser.py
+++ b/dojo/tools/cloudsploit/parser.py
@@ -9,9 +9,8 @@
 
 
 class CloudsploitParser:
-    """
-    AquaSecurity CloudSploit https://github.com/aquasecurity/cloudsploit
-    """
+
+    """AquaSecurity CloudSploit https://github.com/aquasecurity/cloudsploit"""
 
     def get_scan_types(self):
         return ["Cloudsploit Scan"]
diff --git a/dojo/tools/contrast/parser.py b/dojo/tools/contrast/parser.py
index 97e8fbf641..9367bdcf6d 100644
--- a/dojo/tools/contrast/parser.py
+++ b/dojo/tools/contrast/parser.py
@@ -8,6 +8,7 @@
 
 
 class ContrastParser:
+
     """Contrast Scanner CSV Report"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/coverity_api/parser.py b/dojo/tools/coverity_api/parser.py
index 194939de98..912a514c85 100644
--- a/dojo/tools/coverity_api/parser.py
+++ b/dojo/tools/coverity_api/parser.py
@@ -5,6 +5,7 @@
 
 
 class CoverityApiParser:
+
     """Parser that can load data from Synopsys Coverity API"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/coverity_scan/parser.py b/dojo/tools/coverity_scan/parser.py
index 4769758e06..18d701fd33 100644
--- a/dojo/tools/coverity_scan/parser.py
+++ b/dojo/tools/coverity_scan/parser.py
@@ -4,6 +4,7 @@
 
 
 class CoverityScanParser:
+
     """Parser for Coverity Scan JSON files."""
 
     SEVERITY_MAPPING = {
diff --git a/dojo/tools/crashtest_security/parser.py b/dojo/tools/crashtest_security/parser.py
index 71278115ec..0d3110bcc1 100644
--- a/dojo/tools/crashtest_security/parser.py
+++ b/dojo/tools/crashtest_security/parser.py
@@ -9,6 +9,7 @@
 
 
 class CrashtestSecurityJsonParser:
+
     """
     The objective of this class is to parse a json file generated by the crashtest security suite.
 
@@ -141,6 +142,7 @@ def get_severity(self, cvss_base_score):
 
 
 class CrashtestSecurityXmlParser:
+
     """
     The objective of this class is to parse an xml file generated by the crashtest security suite.
 
@@ -168,10 +170,7 @@ def parse_xml(self, xml_output):
         return tree
 
     def get_items(self, tree, test):
-        """
-        @return items A list of Host instances
-        """
-
+        """@return items A list of Host instances"""
         items = []
 
         # Get all testcases
@@ -223,6 +222,7 @@ def get_items(self, tree, test):
 
 
 class CrashtestSecurityParser:
+
     """SSLYze support JSON and XML"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/cred_scan/parser.py b/dojo/tools/cred_scan/parser.py
index e796284346..cd99d57f67 100644
--- a/dojo/tools/cred_scan/parser.py
+++ b/dojo/tools/cred_scan/parser.py
@@ -7,6 +7,7 @@
 
 
 class CredScanParser:
+
     """
     Credential Scanner (aka CredScan) is a tool developed and maintained by
     Microsoft to identify credential leaks such as those in source code and
diff --git a/dojo/tools/cyclonedx/parser.py b/dojo/tools/cyclonedx/parser.py
index d01798e358..a16b3889ac 100644
--- a/dojo/tools/cyclonedx/parser.py
+++ b/dojo/tools/cyclonedx/parser.py
@@ -3,7 +3,9 @@
 
 
 class CycloneDXParser:
-    """CycloneDX is a lightweight software bill of materials (SBOM) standard designed for use in application security
+
+    """
+    CycloneDX is a lightweight software bill of materials (SBOM) standard designed for use in application security
     contexts and supply chain component analysis.
     https://www.cyclonedx.org/
     """
diff --git a/dojo/tools/dependency_track/parser.py b/dojo/tools/dependency_track/parser.py
index eecc09670a..cb4029c8b1 100644
--- a/dojo/tools/dependency_track/parser.py
+++ b/dojo/tools/dependency_track/parser.py
@@ -7,6 +7,7 @@
 
 
 class DependencyTrackParser:
+
     """
     A class that can be used to parse the JSON Finding Packaging Format (FPF) export from OWASP Dependency Track.
 
diff --git a/dojo/tools/detect_secrets/parser.py b/dojo/tools/detect_secrets/parser.py
index efca711543..30e891ea19 100644
--- a/dojo/tools/detect_secrets/parser.py
+++ b/dojo/tools/detect_secrets/parser.py
@@ -7,9 +7,8 @@
 
 
 class DetectSecretsParser:
-    """
-    A class that can be used to parse the detect-secrets JSON report file
-    """
+
+    """A class that can be used to parse the detect-secrets JSON report file"""
 
     def get_scan_types(self):
         return ["Detect-secrets Scan"]
diff --git a/dojo/tools/dockle/parser.py b/dojo/tools/dockle/parser.py
index 6bb70769dd..a34a7af0cb 100644
--- a/dojo/tools/dockle/parser.py
+++ b/dojo/tools/dockle/parser.py
@@ -5,9 +5,8 @@
 
 
 class DockleParser:
-    """
-    A class that can be used to parse the Dockle JSON report files
-    """
+
+    """A class that can be used to parse the Dockle JSON report files"""
 
     # table to match Dockle severity to DefectDojo severity
     SEVERITY = {
diff --git a/dojo/tools/ggshield/parser.py b/dojo/tools/ggshield/parser.py
index 54a5bd23e7..8ba42678a9 100644
--- a/dojo/tools/ggshield/parser.py
+++ b/dojo/tools/ggshield/parser.py
@@ -7,9 +7,8 @@
 
 
 class GgshieldParser:
-    """
-    A class that can be used to parse the Gitleaks JSON report files
-    """
+
+    """A class that can be used to parse the Gitleaks JSON report files"""
 
     def get_scan_types(self):
         return ["Ggshield Scan"]
@@ -21,9 +20,7 @@ def get_description_for_scan_types(self, scan_type):
         return "Import Ggshield Scan findings in JSON format."
 
     def get_findings(self, filename, test):
-        """
-        Converts a Ggshield report to DefectDojo findings
-        """
+        """Converts a Ggshield report to DefectDojo findings"""
         json_data = json.load(filename)
         issues = json_data.get("scans")
         dupes = {}
diff --git a/dojo/tools/gitlab_api_fuzzing/parser.py b/dojo/tools/gitlab_api_fuzzing/parser.py
index f7fae3718e..c536dc0020 100644
--- a/dojo/tools/gitlab_api_fuzzing/parser.py
+++ b/dojo/tools/gitlab_api_fuzzing/parser.py
@@ -4,6 +4,7 @@
 
 
 class GitlabAPIFuzzingParser:
+
     """
     GitLab API Fuzzing Report
 
diff --git a/dojo/tools/gitlab_container_scan/parser.py b/dojo/tools/gitlab_container_scan/parser.py
index 7dd65305e8..612a6a5618 100644
--- a/dojo/tools/gitlab_container_scan/parser.py
+++ b/dojo/tools/gitlab_container_scan/parser.py
@@ -7,6 +7,7 @@
 
 
 class GitlabContainerScanParser:
+
     """
     GitLab's container scanning report
     See more: https://gitlab.com/gitlab-org/security-products/security-report-schemas/-/blob/master/dist/container-scanning-report-format.json
diff --git a/dojo/tools/gitlab_dast/parser.py b/dojo/tools/gitlab_dast/parser.py
index 7728dd00ef..5d5d5a04bd 100644
--- a/dojo/tools/gitlab_dast/parser.py
+++ b/dojo/tools/gitlab_dast/parser.py
@@ -6,9 +6,8 @@
 
 
 class GitlabDastParser:
-    """
-    Import GitLab DAST Report in JSON format
-    """
+
+    """Import GitLab DAST Report in JSON format"""
 
     def get_scan_types(self):
         return ["GitLab DAST Report"]
diff --git a/dojo/tools/gitlab_secret_detection_report/parser.py b/dojo/tools/gitlab_secret_detection_report/parser.py
index f3c6f4c6ea..5398ae8737 100644
--- a/dojo/tools/gitlab_secret_detection_report/parser.py
+++ b/dojo/tools/gitlab_secret_detection_report/parser.py
@@ -5,6 +5,7 @@
 
 
 class GitlabSecretDetectionReportParser:
+
     """
     GitLab's secret detection report
     See more: https://gitlab.com/gitlab-org/security-products/security-report-schemas/-/blob/master/dist/secret-detection-report-format.json
diff --git a/dojo/tools/gitleaks/parser.py b/dojo/tools/gitleaks/parser.py
index 9f32cd26a5..592c20c904 100644
--- a/dojo/tools/gitleaks/parser.py
+++ b/dojo/tools/gitleaks/parser.py
@@ -5,9 +5,8 @@
 
 
 class GitleaksParser:
-    """
-    A class that can be used to parse the Gitleaks JSON report files
-    """
+
+    """A class that can be used to parse the Gitleaks JSON report files"""
 
     def get_scan_types(self):
         return ["Gitleaks Scan"]
@@ -19,9 +18,7 @@ def get_description_for_scan_types(self, scan_type):
         return "Import Gitleaks Scan findings in JSON format."
 
     def get_findings(self, filename, test):
-        """
-        Converts a Gitleaks report to DefectDojo findings
-        """
+        """Converts a Gitleaks report to DefectDojo findings"""
         issues = json.load(filename)
         # empty report are just null object
         if issues is None:
diff --git a/dojo/tools/h1/parser.py b/dojo/tools/h1/parser.py
index 8aa3fc5ff2..a106f07d5d 100644
--- a/dojo/tools/h1/parser.py
+++ b/dojo/tools/h1/parser.py
@@ -15,14 +15,11 @@
 
 
 class HackerOneVulnerabilityDisclosureProgram:
-    """
-    Vulnerability Disclosure Program HackerOne reports
-    """
+
+    """Vulnerability Disclosure Program HackerOne reports"""
 
     def get_vulnerability_disclosure_json_findings(self, tree, test):
-        """
-        Converts a HackerOne reports to a DefectDojo finding
-        """
+        """Converts a HackerOne reports to a DefectDojo finding"""
         # Convert JSON  report to DefectDojo format
         dupes = {}
         for content in tree["data"]:
@@ -147,6 +144,7 @@ def build_description(self, content):
 
 
 class HackerOneBugBountyProgram:
+
     """Bug Bounty Program HackerOne reports."""
 
     fields_to_label: ClassVar[dict[str, str]] = {
@@ -200,7 +198,8 @@ def parse_findings(self, dict_list: list[dict], test: Test) -> list[Finding]:
         return findings
 
     def determine_status(self, row) -> dict:
-        """Generate a dict of status meta to fully represent that state of the finding
+        """
+        Generate a dict of status meta to fully represent that state of the finding
 
         Possible states currently supported are open and closed. In the event that neither
         of those options are present, the open status will be the default, and returned
@@ -256,9 +255,8 @@ class H1Parser(
     HackerOneVulnerabilityDisclosureProgram,
     HackerOneBugBountyProgram,
 ):
-    """
-    A class that can be used to parse the Get All Reports JSON export from HackerOne API.
-    """
+
+    """A class that can be used to parse the Get All Reports JSON export from HackerOne API."""
 
     def get_scan_types(self):
         return ["HackerOne Cases"]
diff --git a/dojo/tools/harbor_vulnerability/parser.py b/dojo/tools/harbor_vulnerability/parser.py
index b1f2ab2363..315d108a2c 100644
--- a/dojo/tools/harbor_vulnerability/parser.py
+++ b/dojo/tools/harbor_vulnerability/parser.py
@@ -4,9 +4,8 @@
 
 
 class HarborVulnerabilityParser:
-    """
-    Read JSON data from Harbor compatible format and import it to DefectDojo
-    """
+
+    """Read JSON data from Harbor compatible format and import it to DefectDojo"""
 
     def get_scan_types(self):
         return ["Harbor Vulnerability Scan"]
diff --git a/dojo/tools/horusec/parser.py b/dojo/tools/horusec/parser.py
index 7dce06ad64..ed6c8eef03 100644
--- a/dojo/tools/horusec/parser.py
+++ b/dojo/tools/horusec/parser.py
@@ -8,6 +8,7 @@
 
 
 class HorusecParser:
+
     """Horusec (https://github.com/ZupIT/horusec)"""
 
     ID = "Horusec"
diff --git a/dojo/tools/humble/parser.py b/dojo/tools/humble/parser.py
index ddab4b7430..7bb8131822 100644
--- a/dojo/tools/humble/parser.py
+++ b/dojo/tools/humble/parser.py
@@ -4,6 +4,7 @@
 
 
 class HumbleParser:
+
     """Humble (https://github.com/rfc-st/humble)"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/huskyci/parser.py b/dojo/tools/huskyci/parser.py
index faa6120b14..dca6a3df98 100644
--- a/dojo/tools/huskyci/parser.py
+++ b/dojo/tools/huskyci/parser.py
@@ -5,9 +5,8 @@
 
 
 class HuskyCIParser:
-    """
-    Read JSON data from huskyCI compatible format and import it to DefectDojo
-    """
+
+    """Read JSON data from huskyCI compatible format and import it to DefectDojo"""
 
     def get_scan_types(self):
         return ["HuskyCI Report"]
diff --git a/dojo/tools/hydra/parser.py b/dojo/tools/hydra/parser.py
index bbdffa0abe..20736178be 100644
--- a/dojo/tools/hydra/parser.py
+++ b/dojo/tools/hydra/parser.py
@@ -22,9 +22,8 @@ def __init__(self, generator):
 
 
 class HydraParser:
-    """
-    Weak password findings from THC-Hydra (https://github.com/vanhauser-thc/thc-hydra)
-    """
+
+    """Weak password findings from THC-Hydra (https://github.com/vanhauser-thc/thc-hydra)"""
 
     def get_scan_types(self):
         return ["Hydra Scan"]
diff --git a/dojo/tools/ibm_app/parser.py b/dojo/tools/ibm_app/parser.py
index 908b632926..eaceebe30f 100644
--- a/dojo/tools/ibm_app/parser.py
+++ b/dojo/tools/ibm_app/parser.py
@@ -148,9 +148,7 @@ def fetch_issue_types(self, root):
 
     # this fetches Issue description
     def fetch_advisory_group(self, root, advisory):
-        """
-        Function that parse advisory-group in order to get the item's description
-        """
+        """Function that parse advisory-group in order to get the item's description"""
         for advisory_group in root.iter("advisory-group"):
             for item in advisory_group.iter("item"):
                 if item.attrib["id"] == advisory:
diff --git a/dojo/tools/intsights/parser.py b/dojo/tools/intsights/parser.py
index ef132f1dfd..4cd6858593 100644
--- a/dojo/tools/intsights/parser.py
+++ b/dojo/tools/intsights/parser.py
@@ -6,9 +6,8 @@
 
 
 class IntSightsParser:
-    """
-    IntSights Threat Intelligence Report
-    """
+
+    """IntSights Threat Intelligence Report"""
 
     _LOGGER = logging.getLogger(__name__)
 
@@ -28,7 +27,6 @@ def _build_finding_description(self, alert: dict) -> str:
             alert: The parsed alert dictionary
         Returns: A markdown formatted description
         """
-
         return "\n".join(
             [
                 alert["description"],
diff --git a/dojo/tools/invicti/parser.py b/dojo/tools/invicti/parser.py
index 93854d9a2d..e5998bd986 100644
--- a/dojo/tools/invicti/parser.py
+++ b/dojo/tools/invicti/parser.py
@@ -12,7 +12,8 @@ def get_description_for_scan_types(self, scan_type):
         return "Invicti JSON format."
 
     def get_findings(self, filename, test):
-        """Extended the NetSparker Parser since the Invicti is the a renamed version of Netsparker.
+        """
+        Extended the NetSparker Parser since the Invicti is the a renamed version of Netsparker.
 
         If there are deviations from the two report formats in the future, then this
         function can be implemented then.
diff --git a/dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py b/dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py
index 456b23a733..f5df685204 100644
--- a/dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py
+++ b/dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py
@@ -7,6 +7,7 @@
 
 
 class JFrogXrayOnDemandBinaryScanParser:
+
     """jfrog_xray_scan JSON reports"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/jfrog_xray_unified/parser.py b/dojo/tools/jfrog_xray_unified/parser.py
index 12efe1afff..a278664b1e 100644
--- a/dojo/tools/jfrog_xray_unified/parser.py
+++ b/dojo/tools/jfrog_xray_unified/parser.py
@@ -5,6 +5,7 @@
 
 
 class JFrogXrayUnifiedParser:
+
     """JFrog Xray JSON reports"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/jfrogxray/parser.py b/dojo/tools/jfrogxray/parser.py
index a1351dc077..c4531c29b0 100644
--- a/dojo/tools/jfrogxray/parser.py
+++ b/dojo/tools/jfrogxray/parser.py
@@ -7,6 +7,7 @@
 
 
 class JFrogXrayParser:
+
     """JFrog Xray JSON reports"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/kics/parser.py b/dojo/tools/kics/parser.py
index 2708047399..5eb30227b5 100644
--- a/dojo/tools/kics/parser.py
+++ b/dojo/tools/kics/parser.py
@@ -5,9 +5,8 @@
 
 
 class KICSParser:
-    """
-    A class that can be used to parse the KICS JSON report file
-    """
+
+    """A class that can be used to parse the KICS JSON report file"""
 
     # table to match KICS severity to DefectDojo severity
     SEVERITY = {
diff --git a/dojo/tools/kubehunter/parser.py b/dojo/tools/kubehunter/parser.py
index 61d8a8a052..cc382f0c11 100644
--- a/dojo/tools/kubehunter/parser.py
+++ b/dojo/tools/kubehunter/parser.py
@@ -5,9 +5,8 @@
 
 
 class KubeHunterParser:
-    """
-    kube-hunter hunts for security weaknesses in Kubernetes clusters. The tool was developed to increase awareness and visibility for security issues in Kubernetes environments.
-    """
+
+    """kube-hunter hunts for security weaknesses in Kubernetes clusters. The tool was developed to increase awareness and visibility for security issues in Kubernetes environments."""
 
     def get_scan_types(self):
         return ["KubeHunter Scan"]
diff --git a/dojo/tools/mend/parser.py b/dojo/tools/mend/parser.py
index dee917ce2a..75ed871a6a 100644
--- a/dojo/tools/mend/parser.py
+++ b/dojo/tools/mend/parser.py
@@ -147,9 +147,7 @@ def _build_common_output(node, lib_name=None):
                 findings.append(_build_common_output(node))
 
         def create_finding_key(f: Finding) -> str:
-            """
-            Hashes the finding's description and title to retrieve a key for deduplication.
-            """
+            """Hashes the finding's description and title to retrieve a key for deduplication."""
             return hashlib.md5(
                 f.description.encode("utf-8")
                 + f.title.encode("utf-8"),
diff --git a/dojo/tools/microfocus_webinspect/parser.py b/dojo/tools/microfocus_webinspect/parser.py
index d5a2611f95..77faf3f843 100644
--- a/dojo/tools/microfocus_webinspect/parser.py
+++ b/dojo/tools/microfocus_webinspect/parser.py
@@ -8,6 +8,7 @@
 
 
 class MicrofocusWebinspectParser:
+
     """Micro Focus Webinspect XML report parser"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/mobsf/parser.py b/dojo/tools/mobsf/parser.py
index b86d7bf041..6155a825d7 100644
--- a/dojo/tools/mobsf/parser.py
+++ b/dojo/tools/mobsf/parser.py
@@ -367,7 +367,8 @@ def get_findings(self, filename, test):
         return list(dupes.values())
 
     def getSeverityForPermission(self, status):
-        """Convert status for permission detection to severity
+        """
+        Convert status for permission detection to severity
 
         In MobSF there is only 4 know values for permission,
          we map them as this:
diff --git a/dojo/tools/mobsfscan/parser.py b/dojo/tools/mobsfscan/parser.py
index bd9fd5167a..83c69a5894 100644
--- a/dojo/tools/mobsfscan/parser.py
+++ b/dojo/tools/mobsfscan/parser.py
@@ -6,9 +6,8 @@
 
 
 class MobsfscanParser:
-    """
-    A class that can be used to parse the mobsfscan (https://github.com/MobSF/mobsfscan) JSON report file.
-    """
+
+    """A class that can be used to parse the mobsfscan (https://github.com/MobSF/mobsfscan) JSON report file."""
 
     SEVERITY = {
         "ERROR": "High",
diff --git a/dojo/tools/mozilla_observatory/parser.py b/dojo/tools/mozilla_observatory/parser.py
index 19e4c7febd..6ef0a89e0c 100644
--- a/dojo/tools/mozilla_observatory/parser.py
+++ b/dojo/tools/mozilla_observatory/parser.py
@@ -4,7 +4,9 @@
 
 
 class MozillaObservatoryParser:
-    """Mozilla Observatory
+
+    """
+    Mozilla Observatory
 
     See: https://observatory.mozilla.org
 
diff --git a/dojo/tools/ms_defender/parser.py b/dojo/tools/ms_defender/parser.py
index ccf348cb46..ad909168c2 100644
--- a/dojo/tools/ms_defender/parser.py
+++ b/dojo/tools/ms_defender/parser.py
@@ -5,9 +5,9 @@
 
 
 class MSDefenderParser:
-    """
-    Import from MSDefender findings
-    """
+
+    """Import from MSDefender findings"""
+
     def __init__(self):
         self.findings = []
 
diff --git a/dojo/tools/nexpose/parser.py b/dojo/tools/nexpose/parser.py
index fb3a7ef20e..d6b63c66c8 100644
--- a/dojo/tools/nexpose/parser.py
+++ b/dojo/tools/nexpose/parser.py
@@ -10,6 +10,7 @@
 
 
 class NexposeParser:
+
     """
     The objective of this class is to parse Nexpose's XML 2.0 Report.
 
@@ -141,9 +142,7 @@ def parse_tests_type(self, node, vulnsDefinitions):
         return vulns
 
     def get_vuln_definitions(self, tree):
-        """
-        @returns vulns A dict of Vulnerability Definitions
-        """
+        """@returns vulns A dict of Vulnerability Definitions"""
         vulns = {}
         url_index = 0
         for vulnsDef in tree.findall("VulnerabilityDefinitions"):
diff --git a/dojo/tools/nikto/parser.py b/dojo/tools/nikto/parser.py
index c3d332d29c..778b257766 100644
--- a/dojo/tools/nikto/parser.py
+++ b/dojo/tools/nikto/parser.py
@@ -3,7 +3,9 @@
 
 
 class NiktoParser:
-    """Nikto web server scanner - https://cirt.net/Nikto2
+
+    """
+    Nikto web server scanner - https://cirt.net/Nikto2
 
     The current parser support 3 sources:
      - XML output (old)
diff --git a/dojo/tools/nmap/parser.py b/dojo/tools/nmap/parser.py
index f1a62892c6..06af0ef0df 100644
--- a/dojo/tools/nmap/parser.py
+++ b/dojo/tools/nmap/parser.py
@@ -137,12 +137,14 @@ def get_findings(self, file, test):
         return list(dupes.values())
 
     def convert_cvss_score(self, raw_value):
-        """According to CVSS official numbers https://nvd.nist.gov/vuln-metrics/cvss
+        """
+        According to CVSS official numbers https://nvd.nist.gov/vuln-metrics/cvss
                         None 	0.0
         Low 	0.0-3.9 	Low 	0.1-3.9
         Medium 	4.0-6.9 	Medium 	4.0-6.9
         High 	7.0-10.0 	High 	7.0-8.9
-        Critical 	9.0-10.0"""
+        Critical 	9.0-10.0
+        """
         val = float(raw_value)
         if val == 0.0:
             return "Info"
diff --git a/dojo/tools/noseyparker/parser.py b/dojo/tools/noseyparker/parser.py
index aa35489a65..65b475a490 100644
--- a/dojo/tools/noseyparker/parser.py
+++ b/dojo/tools/noseyparker/parser.py
@@ -6,9 +6,8 @@
 
 
 class NoseyParkerParser:
-    """
-    Scanning secrets from repos
-    """
+
+    """Scanning secrets from repos"""
 
     def get_scan_types(self):
         return ["Nosey Parker Scan"]
diff --git a/dojo/tools/npm_audit_7_plus/parser.py b/dojo/tools/npm_audit_7_plus/parser.py
index 88198844a0..68e973af92 100644
--- a/dojo/tools/npm_audit_7_plus/parser.py
+++ b/dojo/tools/npm_audit_7_plus/parser.py
@@ -22,6 +22,7 @@
 
 
 class NpmAudit7PlusParser:
+
     """Represents the parser class."""
 
     def get_scan_types(self):
diff --git a/dojo/tools/nuclei/parser.py b/dojo/tools/nuclei/parser.py
index 4c843c6dca..e9c5ac048c 100644
--- a/dojo/tools/nuclei/parser.py
+++ b/dojo/tools/nuclei/parser.py
@@ -11,9 +11,8 @@
 
 
 class NucleiParser:
-    """
-    A class that can be used to parse the nuclei (https://github.com/projectdiscovery/nuclei) JSON report file
-    """
+
+    """A class that can be used to parse the nuclei (https://github.com/projectdiscovery/nuclei) JSON report file"""
 
     DEFAULT_SEVERITY = "Low"
 
diff --git a/dojo/tools/ort/parser.py b/dojo/tools/ort/parser.py
index 9f0927bd1c..85f04f09e2 100644
--- a/dojo/tools/ort/parser.py
+++ b/dojo/tools/ort/parser.py
@@ -6,6 +6,7 @@
 
 
 class OrtParser:
+
     """Oss Review Toolkit Parser"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/ossindex_devaudit/parser.py b/dojo/tools/ossindex_devaudit/parser.py
index 95ddb102d2..35e8b50901 100644
--- a/dojo/tools/ossindex_devaudit/parser.py
+++ b/dojo/tools/ossindex_devaudit/parser.py
@@ -5,7 +5,9 @@
 
 
 class OssIndexDevauditParser:
-    """OssIndex Devaudit Results Parser
+
+    """
+    OssIndex Devaudit Results Parser
     Parses files created by the Sonatype OssIndex Devaudit tool
     https://github.com/sonatype-nexus-community/DevAudit
     """
diff --git a/dojo/tools/pip_audit/parser.py b/dojo/tools/pip_audit/parser.py
index b3e023d3c6..13173c5b6a 100644
--- a/dojo/tools/pip_audit/parser.py
+++ b/dojo/tools/pip_audit/parser.py
@@ -5,6 +5,7 @@
 
 
 class PipAuditParser:
+
     """Represents a file parser capable of ingesting pip-audit results."""
 
     def get_scan_types(self):
diff --git a/dojo/tools/popeye/parser.py b/dojo/tools/popeye/parser.py
index 78c516a1b4..85111d9e9e 100644
--- a/dojo/tools/popeye/parser.py
+++ b/dojo/tools/popeye/parser.py
@@ -6,9 +6,8 @@
 
 
 class PopeyeParser:
-    """
-    Popeye is a kubernetes cluster resource analyzer.
-    """
+
+    """Popeye is a kubernetes cluster resource analyzer."""
 
     def get_scan_types(self):
         return ["Popeye Scan"]
diff --git a/dojo/tools/pwn_sast/parser.py b/dojo/tools/pwn_sast/parser.py
index dac79b67d9..89635ad815 100644
--- a/dojo/tools/pwn_sast/parser.py
+++ b/dojo/tools/pwn_sast/parser.py
@@ -5,9 +5,8 @@
 
 
 class PWNSASTParser:
-    """
-    A class that can be used to parse pwn_sast source code scanning results in JSON format.  See https://github.com/0dayinc/pwn for additional details.
-    """
+
+    """A class that can be used to parse pwn_sast source code scanning results in JSON format.  See https://github.com/0dayinc/pwn for additional details."""
 
     def get_scan_types(self):
         return ["PWN SAST"]
diff --git a/dojo/tools/qualys/csv_parser.py b/dojo/tools/qualys/csv_parser.py
index 2f88814b44..46e49eaedb 100644
--- a/dojo/tools/qualys/csv_parser.py
+++ b/dojo/tools/qualys/csv_parser.py
@@ -19,7 +19,6 @@ def parse_csv(csv_file) -> [Finding]:
         csv_file:
     Returns:
     """
-
     content = csv_file.read()
     if isinstance(content, bytes):
         content = content.decode("utf-8")
@@ -40,7 +39,6 @@ def get_report_findings(csv_reader) -> [dict]:
     Returns:
 
     """
-
     report_findings = []
 
     for row in csv_reader:
@@ -63,7 +61,6 @@ def _extract_cvss_vectors(cvss_base, cvss_temporal):
     Returns:
         A CVSS3 Vector including both Base and Temporal if available
     """
-
     vector_pattern = r"^\d{1,2}.\d \((.*)\)"
     cvss_vector = "CVSS:3.0/"
 
diff --git a/dojo/tools/qualys_hacker_guardian/parser.py b/dojo/tools/qualys_hacker_guardian/parser.py
index 0baea41ac6..2639e8d06f 100644
--- a/dojo/tools/qualys_hacker_guardian/parser.py
+++ b/dojo/tools/qualys_hacker_guardian/parser.py
@@ -7,6 +7,7 @@
 
 
 class QualysHackerGuardianParser:
+
     """Parser for Qualys HackerGuardian"""
 
     # Severity mapping taken from
diff --git a/dojo/tools/rapplex/parser.py b/dojo/tools/rapplex/parser.py
index 092f96031a..6770547dd6 100644
--- a/dojo/tools/rapplex/parser.py
+++ b/dojo/tools/rapplex/parser.py
@@ -7,9 +7,9 @@
 
 
 class RapplexParser:
-    """
-    Rapplex - Web Application Security Scanner
-    """
+
+    """Rapplex - Web Application Security Scanner"""
+
     def get_scan_types(self):
         return ["Rapplex Scan"]
 
diff --git a/dojo/tools/sarif/parser.py b/dojo/tools/sarif/parser.py
index eb83977f0c..e6c6838884 100644
--- a/dojo/tools/sarif/parser.py
+++ b/dojo/tools/sarif/parser.py
@@ -15,7 +15,9 @@
 
 
 class SarifParser:
-    """OASIS Static Analysis Results Interchange Format (SARIF) for version 2.1.0 only.
+
+    """
+    OASIS Static Analysis Results Interchange Format (SARIF) for version 2.1.0 only.
 
     https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=sarif
     """
@@ -132,7 +134,8 @@ def get_artifacts(run):
 
 
 def get_message_from_multiformatMessageString(data, rule):
-    """Get a message from multimessage struct
+    """
+    Get a message from multimessage struct
 
     See here for the specification: https://docs.oasis-open.org/sarif/sarif/v2.1.0/os/sarif-v2.1.0-os.html#_Toc34317468
     """
diff --git a/dojo/tools/scantist/parser.py b/dojo/tools/scantist/parser.py
index c67de9a51c..6b8721d308 100644
--- a/dojo/tools/scantist/parser.py
+++ b/dojo/tools/scantist/parser.py
@@ -5,6 +5,7 @@
 
 
 class ScantistParser:
+
     """
     Scantist Parser: Scantist does a deep scan of source code and binaries for vulnerabilities and has reports
     following three main categories
diff --git a/dojo/tools/scout_suite/parser.py b/dojo/tools/scout_suite/parser.py
index a95b91dcd0..c561bf391e 100644
--- a/dojo/tools/scout_suite/parser.py
+++ b/dojo/tools/scout_suite/parser.py
@@ -7,6 +7,7 @@
 
 
 class ScoutSuiteParser:
+
     """"ScoutSuite Wiki: https://github.com/nccgroup/ScoutSuite/wiki"""
 
     ID = "Scout Suite"
diff --git a/dojo/tools/solar_appscreener/parser.py b/dojo/tools/solar_appscreener/parser.py
index fc6110ebcd..e0a39b1e4b 100644
--- a/dojo/tools/solar_appscreener/parser.py
+++ b/dojo/tools/solar_appscreener/parser.py
@@ -5,9 +5,8 @@
 
 
 class SolarAppscreenerParser:
-    """
-    SAST scanner
-    """
+
+    """SAST scanner"""
 
     def get_scan_types(self):
         return ["Solar Appscreener Scan"]
diff --git a/dojo/tools/spotbugs/parser.py b/dojo/tools/spotbugs/parser.py
index 65ecac2153..b63c1aa198 100644
--- a/dojo/tools/spotbugs/parser.py
+++ b/dojo/tools/spotbugs/parser.py
@@ -7,6 +7,7 @@
 
 
 class SpotbugsParser:
+
     """Parser for XML ouput file from Spotbugs (https://github.com/spotbugs/spotbugs)"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/ssh_audit/parser.py b/dojo/tools/ssh_audit/parser.py
index e1980a2e55..ef2a7776d4 100644
--- a/dojo/tools/ssh_audit/parser.py
+++ b/dojo/tools/ssh_audit/parser.py
@@ -14,12 +14,14 @@ def get_description_for_scan_types(self, scan_type):
         return "Import result of SSH Audit JSON output."
 
     def convert_cvss_score(self, raw_value):
-        """According to CVSS official numbers https://nvd.nist.gov/vuln-metrics/cvss
+        """
+        According to CVSS official numbers https://nvd.nist.gov/vuln-metrics/cvss
                         None 	0.0
         Low 	0.0-3.9 	Low 	0.1-3.9
         Medium 	4.0-6.9 	Medium 	4.0-6.9
         High 	7.0-10.0 	High 	7.0-8.9
-        Critical 	9.0-10.0"""
+        Critical 	9.0-10.0
+        """
         val = float(raw_value)
         if val == 0.0:
             return "Info"
diff --git a/dojo/tools/sslyze/parser.py b/dojo/tools/sslyze/parser.py
index a90edaa5db..754cab81f4 100644
--- a/dojo/tools/sslyze/parser.py
+++ b/dojo/tools/sslyze/parser.py
@@ -3,6 +3,7 @@
 
 
 class SslyzeParser:
+
     """SSLyze support JSON and XML"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/stackhawk/parser.py b/dojo/tools/stackhawk/parser.py
index 20462d804d..86a2ce1fe9 100644
--- a/dojo/tools/stackhawk/parser.py
+++ b/dojo/tools/stackhawk/parser.py
@@ -16,9 +16,8 @@ def __init__(self, completed_scan):
 
 
 class StackHawkParser:
-    """
-    DAST findings from StackHawk
-    """
+
+    """DAST findings from StackHawk"""
 
     def get_scan_types(self):
         return ["StackHawk HawkScan"]
diff --git a/dojo/tools/sysdig_reports/parser.py b/dojo/tools/sysdig_reports/parser.py
index f4241e3bdc..0db2f64340 100644
--- a/dojo/tools/sysdig_reports/parser.py
+++ b/dojo/tools/sysdig_reports/parser.py
@@ -8,9 +8,8 @@
 
 
 class SysdigReportsParser:
-    """
-    Sysdig Report Importer - Runtime CSV
-    """
+
+    """Sysdig Report Importer - Runtime CSV"""
 
     def get_scan_types(self):
         return ["Sysdig Vulnerability Report"]
diff --git a/dojo/tools/sysdig_reports/sysdig_csv_parser.py b/dojo/tools/sysdig_reports/sysdig_csv_parser.py
index 534b30c7e2..8bc791a557 100644
--- a/dojo/tools/sysdig_reports/sysdig_csv_parser.py
+++ b/dojo/tools/sysdig_reports/sysdig_csv_parser.py
@@ -5,9 +5,8 @@
 
 
 class CSVParser:
-    """
-    Sysdig CSV Data Parser
-    """
+
+    """Sysdig CSV Data Parser"""
 
     def parse(self, filename) -> SysdigData:
 
diff --git a/dojo/tools/talisman/parser.py b/dojo/tools/talisman/parser.py
index f3d0413887..410d382189 100644
--- a/dojo/tools/talisman/parser.py
+++ b/dojo/tools/talisman/parser.py
@@ -5,32 +5,23 @@
 
 
 class TalismanParser:
-    """
-    A class that can be used to parse the Talisman JSON report files
-    """
+
+    """A class that can be used to parse the Talisman JSON report files"""
 
     def get_scan_types(self):
-        """
-        Get scan type
-        """
+        """Get scan type"""
         return ["Talisman Scan"]
 
     def get_label_for_scan_types(self, scan_type):
-        """
-        Get label for scan type
-        """
+        """Get label for scan type"""
         return scan_type
 
     def get_description_for_scan_types(self, scan_type):
-        """
-        Get description for scan type
-        """
+        """Get description for scan type"""
         return "Import Talisman Scan findings in JSON format."
 
     def get_findings(self, filename, test):
-        """
-        Converts a Talisman JSON report to DefectDojo findings
-        """
+        """Converts a Talisman JSON report to DefectDojo findings"""
         if filename is None:
             return []
 
diff --git a/dojo/tools/terrascan/parser.py b/dojo/tools/terrascan/parser.py
index c8b07f4e14..ec17ab73a7 100644
--- a/dojo/tools/terrascan/parser.py
+++ b/dojo/tools/terrascan/parser.py
@@ -5,9 +5,8 @@
 
 
 class TerrascanParser:
-    """
-    A class that can be used to parse the terrascan JSON report file
-    """
+
+    """A class that can be used to parse the terrascan JSON report file"""
 
     # table to match tfsec severity to DefectDojo severity
     SEVERITY = {
diff --git a/dojo/tools/tfsec/parser.py b/dojo/tools/tfsec/parser.py
index d0bc390f3a..0dd105c151 100644
--- a/dojo/tools/tfsec/parser.py
+++ b/dojo/tools/tfsec/parser.py
@@ -5,9 +5,8 @@
 
 
 class TFSecParser:
-    """
-    A class that can be used to parse the tfsec JSON report file
-    """
+
+    """A class that can be used to parse the tfsec JSON report file"""
 
     # table to match tfsec severity to DefectDojo severity
     SEVERITY = {
diff --git a/dojo/tools/threagile/parser.py b/dojo/tools/threagile/parser.py
index 796d260e6d..6d0754f617 100644
--- a/dojo/tools/threagile/parser.py
+++ b/dojo/tools/threagile/parser.py
@@ -49,9 +49,8 @@
 
 
 class ThreagileParser:
-    """
-    Import ThreaAgile threatmodel risk finding in JSON format
-    """
+
+    """Import ThreaAgile threatmodel risk finding in JSON format"""
 
     REQUIRED_FIELDS = ["category", "title", "severity", "synthetic_id",
                        "exploitation_impact"]
diff --git a/dojo/tools/threat_composer/parser.py b/dojo/tools/threat_composer/parser.py
index f1099641b0..266d63fd66 100644
--- a/dojo/tools/threat_composer/parser.py
+++ b/dojo/tools/threat_composer/parser.py
@@ -6,9 +6,8 @@
 
 
 class ThreatComposerParser:
-    """
-    Threat Composer JSON can be imported. See here for more info on this JSON format.
-    """
+
+    """Threat Composer JSON can be imported. See here for more info on this JSON format."""
 
     PRIORITY_VALUES = ["Low", "Medium", "High"]
     STRIDE_VALUES = {
diff --git a/dojo/tools/trivy/parser.py b/dojo/tools/trivy/parser.py
index 1fde84a80f..222b540a9a 100644
--- a/dojo/tools/trivy/parser.py
+++ b/dojo/tools/trivy/parser.py
@@ -1,6 +1,4 @@
-"""
-Parser for Aquasecurity trivy (https://github.com/aquasecurity/trivy) Docker images scaner
-"""
+"""Parser for Aquasecurity trivy (https://github.com/aquasecurity/trivy) Docker images scaner"""
 
 import json
 import logging
diff --git a/dojo/tools/trivy_operator/parser.py b/dojo/tools/trivy_operator/parser.py
index 3e83cfccf0..138cee1762 100644
--- a/dojo/tools/trivy_operator/parser.py
+++ b/dojo/tools/trivy_operator/parser.py
@@ -1,6 +1,4 @@
-"""
-Parser for Aquasecurity trivy-operator (https://github.com/aquasecurity/trivy-operator)
-"""
+"""Parser for Aquasecurity trivy-operator (https://github.com/aquasecurity/trivy-operator)"""
 
 import json
 
diff --git a/dojo/tools/trustwave_fusion_api/parser.py b/dojo/tools/trustwave_fusion_api/parser.py
index 8ee522acc3..c7bc6f1eff 100644
--- a/dojo/tools/trustwave_fusion_api/parser.py
+++ b/dojo/tools/trustwave_fusion_api/parser.py
@@ -8,9 +8,8 @@
 
 
 class TrustwaveFusionAPIParser:
-    """
-    Import Trustwave Fusion Report from its API in JSON format
-    """
+
+    """Import Trustwave Fusion Report from its API in JSON format"""
 
     def get_scan_types(self):
         return ["Trustwave Fusion API Scan"]
diff --git a/dojo/tools/utils.py b/dojo/tools/utils.py
index f18b1f4f16..19f9841ae5 100644
--- a/dojo/tools/utils.py
+++ b/dojo/tools/utils.py
@@ -6,11 +6,11 @@
 
 def get_npm_cwe(item_node):
     """
-        possible values:
-            "cwe": null
-            "cwe": ["CWE-173", "CWE-200","CWE-601"]  (or [])
-            "cwe": "CWE-1234"
-            "cwe": '["CWE-173","CWE-200","CWE-601"]' (or "[]")
+    possible values:
+        "cwe": null
+        "cwe": ["CWE-173", "CWE-200","CWE-601"]  (or [])
+        "cwe": "CWE-1234"
+        "cwe": '["CWE-173","CWE-200","CWE-601"]' (or "[]")
     """
     cwe_node = item_node.get("cwe")
     if cwe_node:
diff --git a/dojo/tools/vcg/parser.py b/dojo/tools/vcg/parser.py
index 7b35eb81dd..34fcbc6f67 100644
--- a/dojo/tools/vcg/parser.py
+++ b/dojo/tools/vcg/parser.py
@@ -196,6 +196,7 @@ def __init__(self):
 
 
 class VCGParser:
+
     """VCG (VisualCodeGrepper) support CSV and XML"""
 
     def get_scan_types(self):
diff --git a/dojo/tools/veracode/json_parser.py b/dojo/tools/veracode/json_parser.py
index fe48bbb46f..6584d21382 100644
--- a/dojo/tools/veracode/json_parser.py
+++ b/dojo/tools/veracode/json_parser.py
@@ -9,7 +9,9 @@
 
 
 class VeracodeJSONParser:
-    """This parser is written for Veracode REST Findings.
+
+    """
+    This parser is written for Veracode REST Findings.
 
     API endpoints to use: https://docs.veracode.com/r/c_findings_v2_examples
 
diff --git a/dojo/tools/veracode/xml_parser.py b/dojo/tools/veracode/xml_parser.py
index 2590849173..17061402d6 100644
--- a/dojo/tools/veracode/xml_parser.py
+++ b/dojo/tools/veracode/xml_parser.py
@@ -11,7 +11,9 @@
 
 
 class VeracodeXMLParser:
-    """This parser is written for Veracode Detailed XML reports, version 1.5.
+
+    """
+    This parser is written for Veracode Detailed XML reports, version 1.5.
 
     Version is annotated in the report, `detailedreport/@report_format_version`.
     see https://help.veracode.com/r/t_download_XML_report
diff --git a/dojo/tools/wapiti/parser.py b/dojo/tools/wapiti/parser.py
index 3b6c6dfd4f..8a42ad1c64 100644
--- a/dojo/tools/wapiti/parser.py
+++ b/dojo/tools/wapiti/parser.py
@@ -10,7 +10,9 @@
 
 
 class WapitiParser:
-    """The web-application vulnerability scanner
+
+    """
+    The web-application vulnerability scanner
 
     see: https://wapiti.sourceforge.io/
     """
diff --git a/dojo/tools/wazuh/parser.py b/dojo/tools/wazuh/parser.py
index ae4bf98c22..c3bf5460fc 100644
--- a/dojo/tools/wazuh/parser.py
+++ b/dojo/tools/wazuh/parser.py
@@ -5,6 +5,7 @@
 
 
 class WazuhParser:
+
     """
     The vulnerabilities with condition "Package unfixed" are skipped because there is no fix out yet.
     https://github.com/wazuh/wazuh/issues/14560
diff --git a/dojo/tools/wfuzz/parser.py b/dojo/tools/wfuzz/parser.py
index 2042fe5c17..bd718af546 100644
--- a/dojo/tools/wfuzz/parser.py
+++ b/dojo/tools/wfuzz/parser.py
@@ -7,9 +7,8 @@
 
 
 class WFuzzParser:
-    """
-    A class that can be used to parse the WFuzz JSON report files
-    """
+
+    """A class that can be used to parse the WFuzz JSON report files"""
 
     # match HTTP error code and severity
     def severity_mapper(self, input):
diff --git a/dojo/tools/whispers/parser.py b/dojo/tools/whispers/parser.py
index 5fa1401459..e6adcfd1d0 100644
--- a/dojo/tools/whispers/parser.py
+++ b/dojo/tools/whispers/parser.py
@@ -4,9 +4,8 @@
 
 
 class WhispersParser:
-    """
-    Identify hardcoded secrets in static structured text
-    """
+
+    """Identify hardcoded secrets in static structured text"""
 
     SEVERITY_MAP = {
         # Whispers 2.1
diff --git a/dojo/tools/whitehat_sentinel/parser.py b/dojo/tools/whitehat_sentinel/parser.py
index ecfad6227b..325bd36428 100644
--- a/dojo/tools/whitehat_sentinel/parser.py
+++ b/dojo/tools/whitehat_sentinel/parser.py
@@ -9,6 +9,7 @@
 
 
 class WhiteHatSentinelParser:
+
     """
     A class to parse WhiteHat Sentinel vulns from the WhiteHat Sentinel API vuln?query_site=[
     SITE_ID]&format=json&display_attack_vectors=all&display_custom_risk=1&display_risk=1&display_description=custom
@@ -95,7 +96,6 @@ def _parse_description(self, whitehat_sentinel_description: dict):
             whitehat_sentinel_description: The description section of the WhiteHat Sentinel vulnerability dict
         Returns: A dict with description and reference link
         """
-
         description_ref = {"description": "", "reference_link": ""}
 
         # The references section is always between <h2> or <strong> tags
@@ -149,7 +149,6 @@ def __get_href_url(self, text_to_search):
             text_to_search: The text string to search for an anchor tag
         Returns:
         """
-
         links = ""
 
         for match in re.findall(r'(<a href=")(https://\S+)">', text_to_search):
@@ -163,7 +162,6 @@ def __remove_paragraph_tags(self, html_string):
             html_string: The HMTL string to remove <p> </p> tags from
         Returns: The original string stipped of paragraph tags
         """
-
         return re.sub(r"<p>|</p>", "", html_string)
 
     def _convert_attack_vectors_to_endpoints(
@@ -176,7 +174,6 @@ def _convert_attack_vectors_to_endpoints(
             attack_vectors: The list of Attack Vector dictionaries
         Returns: A list of Defect Dojo Endpoints
         """
-
         endpoints_list = []
 
         # This should be in the Endpoint class should it not?
diff --git a/dojo/tools/wiz/parser.py b/dojo/tools/wiz/parser.py
index ff98d94e49..219cf71514 100644
--- a/dojo/tools/wiz/parser.py
+++ b/dojo/tools/wiz/parser.py
@@ -12,10 +12,12 @@
 
 
 class WizParserByTitle:
+
     """Parser the CSV where the "Title" field is the match for a finding title."""
 
     def parse_findings(self, test: Test, reader: csv.DictReader) -> list[Finding]:
-        """Parse the CSV with the assumed format of the link below.
+        """
+        Parse the CSV with the assumed format of the link below.
 
         test file: https://github.com/DefectDojo/django-DefectDojo/blob/master/unittests/scans/wiz/multiple_findings.csv
         """
@@ -74,10 +76,12 @@ def parse_findings(self, test: Test, reader: csv.DictReader) -> list[Finding]:
 
 
 class WizParserByDetailedName:
+
     """Parser the CSV where the "DetailedName" and "Name" fields are the match for a finding title."""
 
     def parse_findings(self, test: Test, reader: csv.DictReader) -> list[Finding]:
-        """Parse the CSV with the assumed format of the link below.
+        """
+        Parse the CSV with the assumed format of the link below.
 
         test file: Coming soon!
         """
@@ -151,7 +155,8 @@ def _construct_string_field(self, fields: dict[str, str], row: dict) -> str:
         return return_string
 
     def _parse_tags(self, tags: str) -> list[str]:
-        """parse the Tag string dict, and convert to a list of strings.
+        """
+        parse the Tag string dict, and convert to a list of strings.
 
         The format of the tags is is "{""key"":""value""}" format
         """
@@ -168,7 +173,8 @@ def _validate_severities(self, severity: str) -> str:
         return severity
 
     def _convert_status(self, row: dict) -> dict:
-        """Convert the "FindingStatus" column to a dict of Finding statuses.
+        """
+        Convert the "FindingStatus" column to a dict of Finding statuses.
 
         - Open-> Active = True
         - Other statuses that may exist...
diff --git a/dojo/tools/wizcli_dir/parser.py b/dojo/tools/wizcli_dir/parser.py
index fe8e6e1b13..1beb0b68db 100644
--- a/dojo/tools/wizcli_dir/parser.py
+++ b/dojo/tools/wizcli_dir/parser.py
@@ -4,9 +4,8 @@
 
 
 class WizcliDirParser:
-    """
-    Wizcli Dir Scan results in JSON file format.
-    """
+
+    """Wizcli Dir Scan results in JSON file format."""
 
     def get_scan_types(self):
         return ["Wizcli Dir Scan"]
diff --git a/dojo/tools/wizcli_iac/parser.py b/dojo/tools/wizcli_iac/parser.py
index 2caa0da769..40a53d62df 100644
--- a/dojo/tools/wizcli_iac/parser.py
+++ b/dojo/tools/wizcli_iac/parser.py
@@ -4,9 +4,8 @@
 
 
 class WizcliIaCParser:
-    """
-    Wizcli IaC Scan results in JSON file format.
-    """
+
+    """Wizcli IaC Scan results in JSON file format."""
 
     def get_scan_types(self):
         return ["Wizcli IaC Scan"]
diff --git a/dojo/tools/wizcli_img/parser.py b/dojo/tools/wizcli_img/parser.py
index 2372ff1743..3b8a898b4d 100644
--- a/dojo/tools/wizcli_img/parser.py
+++ b/dojo/tools/wizcli_img/parser.py
@@ -4,9 +4,8 @@
 
 
 class WizcliImgParser:
-    """
-    Wizcli Image Scan results in JSON file format.
-    """
+
+    """Wizcli Image Scan results in JSON file format."""
 
     def get_scan_types(self):
         return ["Wizcli Img Scan"]
diff --git a/dojo/tools/wpscan/parser.py b/dojo/tools/wpscan/parser.py
index ed024db22b..95c0a8c4c2 100644
--- a/dojo/tools/wpscan/parser.py
+++ b/dojo/tools/wpscan/parser.py
@@ -6,6 +6,7 @@
 
 
 class WpscanParser:
+
     """WPScan - WordPress Security Scanner"""
 
     def get_scan_types(self):
@@ -185,7 +186,8 @@ def generate_references(self, node):
         return references
 
     def _get_scanner_confidence(self, val):
-        """Confidence value are from 0 (wrong) to 100 (certain)
+        """
+        Confidence value are from 0 (wrong) to 100 (certain)
         So we divide by 10 and invert axis
         """
         if val is None:
diff --git a/dojo/tools/zap/parser.py b/dojo/tools/zap/parser.py
index c56ec6169f..19fbf16241 100644
--- a/dojo/tools/zap/parser.py
+++ b/dojo/tools/zap/parser.py
@@ -5,6 +5,7 @@
 
 
 class ZapParser:
+
     """Parser for XML file generated by the OWASP Zed Attacl Proxy (ZAP) tool https://www.zaproxy.org/."""
 
     MAPPING_SEVERITY = {"0": "Info", "1": "Low", "2": "Medium", "3": "High"}
diff --git a/dojo/utils.py b/dojo/utils.py
index 683bec737f..470d860772 100644
--- a/dojo/utils.py
+++ b/dojo/utils.py
@@ -74,7 +74,8 @@
 
 
 def do_false_positive_history(finding, *args, **kwargs):
-    """Replicate false positives across product.
+    """
+    Replicate false positives across product.
 
     Mark finding as false positive if the same finding was previously marked
     as false positive in the same product, beyond that, retroactively mark
@@ -134,7 +135,8 @@ def do_false_positive_history(finding, *args, **kwargs):
 
 
 def match_finding_to_existing_findings(finding, product=None, engagement=None, test=None):
-    """Customizable lookup that returns all existing findings for a given finding.
+    """
+    Customizable lookup that returns all existing findings for a given finding.
 
     Takes one finding as an argument and returns all findings that are equal to it
     on the same product, engagement or test. For now, only one custom filter can
@@ -1235,9 +1237,7 @@ def get_cal_event(start_date, end_date, summary, description, uid):
 
 
 def named_month(month_number):
-    """
-    Return the name of the month, given the number.
-    """
+    """Return the name of the month, given the number."""
     return date(1900, month_number, 1).strftime("%B")
 
 
@@ -1250,7 +1250,8 @@ def normalize_query(query_string,
 
 
 def build_query(query_string, search_fields):
-    """ Returns a query, that is a combination of Q objects. That combination
+    """
+    Returns a query, that is a combination of Q objects. That combination
     aims to search keywords within a model by testing the given search fields.
 
     """
@@ -1563,7 +1564,6 @@ def get_work_days(start: date, end: date):
     about specific country holidays or extra working days.
     https://stackoverflow.com/questions/3615375/number-of-days-between-2-dates-excluding-weekends/71977946#71977946
     """
-
     # if the start date is on a weekend, forward the date to next Monday
     if start.weekday() > WEEKDAY_FRIDAY:
         start = start + timedelta(days=7 - start.weekday())
@@ -2154,7 +2154,8 @@ def add_field_errors_to_response(form):
 
 
 def mass_model_updater(model_type, models, function, fields, page_size=1000, order="asc", log_prefix=""):
-    """ Using the default for model in queryset can be slow for large querysets. Even
+    """
+    Using the default for model in queryset can be slow for large querysets. Even
     when using paging as LIMIT and OFFSET are slow on database. In some cases we can optimize
     this process very well if we can process the models ordered by id.
     In that case we don't need LIMIT or OFFSET, but can keep track of the latest id that
@@ -2220,7 +2221,7 @@ def mass_model_updater(model_type, models, function, fields, page_size=1000, ord
 
 
 def to_str_typed(obj):
-    """ for code that handles multiple types of objects, print not only __str__ but prefix the type of the object"""
+    """for code that handles multiple types of objects, print not only __str__ but prefix the type of the object"""
     return f"{type(obj)}: {obj}"
 
 
@@ -2603,7 +2604,8 @@ def get_custom_method(setting_name: str) -> Optional[Callable]:
 
 
 def generate_file_response(file_object: FileUpload) -> FileResponse:
-    """Serve an uploaded file in a uniformed way.
+    """
+    Serve an uploaded file in a uniformed way.
 
     This function assumes all permissions have previously validated/verified
     by the caller of this function.
diff --git a/ruff.toml b/ruff.toml
index 50f8a2baf0..d948974fcc 100644
--- a/ruff.toml
+++ b/ruff.toml
@@ -34,7 +34,7 @@ select = [
    "W",
    "C90",
    "I",
-   "D3",
+   "D2", "D3",
    "UP",
    "YTT",
    "ASYNC",
@@ -87,6 +87,9 @@ ignore = [
     "RUF012",
     "RUF015",
     "RUF027",
+    "D205",
+    "D211",  # `one-blank-line-before-class` (D203) and `no-blank-line-before-class` (D211) are incompatible.
+    "D212",  # `multi-line-summary-first-line` (D212) and `multi-line-summary-second-line` (D213) are incompatible.
 ]
 
 # Allow autofix for all enabled rules (when `--fix`) is provided.
diff --git a/tests/base_test_class.py b/tests/base_test_class.py
index bea137e484..bf966bab17 100644
--- a/tests/base_test_class.py
+++ b/tests/base_test_class.py
@@ -407,7 +407,6 @@ def assertNoConsoleErrors(self):
         {'level': 'WARNING', 'message': 'http://localhost:8080/product/type/4/edit 562:16 "warning"', 'source': 'console-api', 'timestamp': 1583952828410}
         {'level': 'SEVERE', 'message': 'http://localhost:8080/product/type/4/edit 563:16 "error"', 'source': 'console-api', 'timestamp': 1583952828410}
         """
-
         for entry in WebdriverOnlyNewLogFacade(self.driver).get_log("browser"):
             """
             Images are now working after https://github.com/DefectDojo/django-DefectDojo/pull/3954,
diff --git a/unittests/test_apiv2_endpoint.py b/unittests/test_apiv2_endpoint.py
index 25c414587b..95e2e533ba 100644
--- a/unittests/test_apiv2_endpoint.py
+++ b/unittests/test_apiv2_endpoint.py
@@ -4,9 +4,9 @@
 
 
 class EndpointTest(APITestCase):
-    """
-    Test the Endpoint APIv2 endpoint.
-    """
+
+    """Test the Endpoint APIv2 endpoint."""
+
     fixtures = ["dojo_testdata.json"]
 
     def setUp(self):
diff --git a/unittests/test_apiv2_limit_reqresp.py b/unittests/test_apiv2_limit_reqresp.py
index dda80135f2..ca90f7f8a2 100644
--- a/unittests/test_apiv2_limit_reqresp.py
+++ b/unittests/test_apiv2_limit_reqresp.py
@@ -5,9 +5,8 @@
 
 
 class APILimitReqRespPairsTest(APITestCase):
-    """
-    Test the MAX_REQRESP_FROM_API setting for /api/v2/findings/{id}/request_response/
-    """
+
+    """Test the MAX_REQRESP_FROM_API setting for /api/v2/findings/{id}/request_response/"""
 
     fixtures = ["unit_limit_reqresp.json"]
 
diff --git a/unittests/test_apiv2_metadata.py b/unittests/test_apiv2_metadata.py
index 21f0defac4..3d4be828f0 100644
--- a/unittests/test_apiv2_metadata.py
+++ b/unittests/test_apiv2_metadata.py
@@ -4,9 +4,9 @@
 
 
 class MetadataTest(APITestCase):
-    """
-    Test the metadata APIv2 endpoint.
-    """
+
+    """Test the metadata APIv2 endpoint."""
+
     fixtures = ["dojo_testdata.json"]
 
     def setUp(self):
diff --git a/unittests/test_apiv2_notifications.py b/unittests/test_apiv2_notifications.py
index a31b859a76..d24a05f596 100644
--- a/unittests/test_apiv2_notifications.py
+++ b/unittests/test_apiv2_notifications.py
@@ -6,9 +6,9 @@
 
 
 class NotificationsTest(DojoAPITestCase):
-    """
-    Test the metadata APIv2 endpoint.
-    """
+
+    """Test the metadata APIv2 endpoint."""
+
     fixtures = ["dojo_testdata.json"]
 
     def setUp(self):
@@ -57,9 +57,7 @@ def test_notification_template_multiple(self):
         self.assertEqual("Notification template already exists", r.json()["non_field_errors"][0])
 
     def test_user_notifications(self):
-        """
-        creates user and checks if template is assigned
-        """
+        """creates user and checks if template is assigned"""
         user = {"user": self.create_test_user()}
         r = self.client.get(reverse("notifications-list"), user, format="json")
         self.assertEqual(r.status_code, 200)
diff --git a/unittests/test_apiv2_scan_import_options.py b/unittests/test_apiv2_scan_import_options.py
index 8d296ca20f..56c084baab 100644
--- a/unittests/test_apiv2_scan_import_options.py
+++ b/unittests/test_apiv2_scan_import_options.py
@@ -7,10 +7,12 @@
 
 
 class ScanImportOptionsTest(APITestCase):
+
     """
     Test the options `skip_duplicates` and `close_old_findings` for the scan
     import APIv2 endpoint with ZAP
     """
+
     fixtures = ["dojo_testdata.json"]
     EMPTY_ZAP_SCAN = """<?xml version="1.0"?>
 <OWASPZAPReport version="2.7.0" generated="Tue, 17 Apr 2018 07:18:05">
@@ -50,15 +52,11 @@ def get_all_finding_ids(self, **kwargs):
                    .order_by("id").values_list("id", flat=True))
 
     def test_epmty_scan(self):
-        """
-        Import the ZAP scan without a test file.
-        """
+        """Import the ZAP scan without a test file."""
         test = self.import_zap_scan(upload_empty_scan=False)
         self.assertNotEqual(len(self.get_all_finding_ids(active=True, test__test_type=test.test_type)), 0)
 
     def test_full_scan(self):
-        """
-        Import the ZAP scan with a test file.
-        """
+        """Import the ZAP scan with a test file."""
         test = self.import_zap_scan(upload_empty_scan=True)
         self.assertNotEqual(len(self.get_all_finding_ids(active=True, test__test_type=test.test_type)), 0)
diff --git a/unittests/test_apiv2_user.py b/unittests/test_apiv2_user.py
index 9b9fe02618..14715ae058 100644
--- a/unittests/test_apiv2_user.py
+++ b/unittests/test_apiv2_user.py
@@ -4,9 +4,9 @@
 
 
 class UserTest(APITestCase):
-    """
-    Test the User APIv2 endpoint.
-    """
+
+    """Test the User APIv2 endpoint."""
+
     fixtures = ["dojo_testdata.json"]
 
     def setUp(self):
diff --git a/unittests/test_finding_model.py b/unittests/test_finding_model.py
index 130b658599..a156301274 100644
--- a/unittests/test_finding_model.py
+++ b/unittests/test_finding_model.py
@@ -332,8 +332,8 @@ def run(self, result=None):
 
     def test_sla_expiration_date(self):
         """
-            tests if the SLA expiration date and SLA days remaining are calculated correctly
-            after a finding's severity is updated
+        tests if the SLA expiration date and SLA days remaining are calculated correctly
+        after a finding's severity is updated
         """
         user, _ = User.objects.get_or_create(username="admin")
         product_type = self.create_product_type("test_product_type")
@@ -357,8 +357,8 @@ def test_sla_expiration_date(self):
 
     def test_sla_expiration_date_after_finding_severity_updated(self):
         """
-            tests if the SLA expiration date and SLA days remaining are calculated correctly
-            after a finding's severity is updated
+        tests if the SLA expiration date and SLA days remaining are calculated correctly
+        after a finding's severity is updated
         """
         user, _ = User.objects.get_or_create(username="admin")
         product_type = self.create_product_type("test_product_type")
@@ -389,8 +389,8 @@ def test_sla_expiration_date_after_finding_severity_updated(self):
 
     def test_sla_expiration_date_after_product_updated(self):
         """
-            tests if the SLA expiration date and SLA days remaining are calculated correctly
-            after a product changed from one SLA configuration to another
+        tests if the SLA expiration date and SLA days remaining are calculated correctly
+        after a product changed from one SLA configuration to another
         """
         user, _ = User.objects.get_or_create(username="admin")
         product_type = self.create_product_type("test_product_type")
@@ -428,8 +428,8 @@ def test_sla_expiration_date_after_product_updated(self):
 
     def test_sla_expiration_date_after_sla_configuration_updated(self):
         """
-            tests if the SLA expiration date and SLA days remaining are calculated correctly
-            after the SLA configuration on a product was updated to a different number of SLA days
+        tests if the SLA expiration date and SLA days remaining are calculated correctly
+        after the SLA configuration on a product was updated to a different number of SLA days
         """
         user, _ = User.objects.get_or_create(username="admin")
         product_type = self.create_product_type("test_product_type")
@@ -461,8 +461,8 @@ def test_sla_expiration_date_after_sla_configuration_updated(self):
 
     def test_sla_expiration_date_after_sla_not_enforced(self):
         """
-            tests if the SLA expiration date is none after the after the SLA configuration on a
-            product was updated to not enforce all SLA remediation days
+        tests if the SLA expiration date is none after the after the SLA configuration on a
+        product was updated to not enforce all SLA remediation days
         """
         user, _ = User.objects.get_or_create(username="admin")
         product_type = self.create_product_type("test_product_type")
diff --git a/unittests/test_import_reimport.py b/unittests/test_import_reimport.py
index 2d68989c18..03cea9b0b0 100644
--- a/unittests/test_import_reimport.py
+++ b/unittests/test_import_reimport.py
@@ -1347,11 +1347,11 @@ def test_import_param_close_old_findings_with_and_without_service_2(self):
         self.assertEqual(engagement_findings_count, 4)
 
     def test_import_reimport_generic(self):
-        """This test do a basic import and re-import of a generic JSON report
+        """
+        This test do a basic import and re-import of a generic JSON report
 
         This test is useful because some features are only activated in generic JSON format
         """
-
         import0 = self.import_scan_with_params(self.generic_filename_with_file, scan_type="Generic Findings Import")
 
         test_id = import0["test"]
@@ -1376,12 +1376,12 @@ def test_import_reimport_generic(self):
         self.assert_finding_count_json(1, findings)
 
     def test_import_nuclei_emptyc(self):
-        """This test do a basic import of Nuclei report with no vulnerability
+        """
+        This test do a basic import of Nuclei report with no vulnerability
 
         This test is useful because Nuclei use jsonl for his format so it can generate empty files.
         It tests the condition limit of loading an empty file.
         """
-
         import0 = self.import_scan_with_params(self.nuclei_empty, scan_type="Nuclei Scan")
 
         test_id = import0["test"]
diff --git a/unittests/test_metrics_queries.py b/unittests/test_metrics_queries.py
index 460b426e8b..6bd54ff9e8 100644
--- a/unittests/test_metrics_queries.py
+++ b/unittests/test_metrics_queries.py
@@ -1,6 +1,4 @@
-"""
-Tests for metrics database queries
-"""
+"""Tests for metrics database queries"""
 
 from datetime import date, datetime, timezone
 from unittest.mock import patch
diff --git a/unittests/test_rest_framework.py b/unittests/test_rest_framework.py
index 639f43431e..5d2122005b 100644
--- a/unittests/test_rest_framework.py
+++ b/unittests/test_rest_framework.py
@@ -1941,9 +1941,7 @@ def test_create_not_authorized_product_name_engagement_name_auto_create_product_
     @patch("dojo.importers.default_importer.DefaultImporter.process_scan")
     @patch("dojo.api_v2.permissions.user_has_permission")
     def test_create_authorized_product_name_engagement_name_auto_create_engagement(self, mock, importer_mock, reimporter_mock):
-        """
-        Test creating a new engagement should also check for import scan permission in the product
-        """
+        """Test creating a new engagement should also check for import scan permission in the product"""
         mock.return_value = True
         importer_mock.return_value = IMPORTER_MOCK_RETURN_VALUE
         reimporter_mock.return_value = REIMPORTER_MOCK_RETURN_VALUE
@@ -2139,9 +2137,7 @@ def test_create_authorized_product_name_engagement_name_scan_type_title_auto_cre
     @patch("dojo.importers.default_importer.DefaultImporter.process_scan")
     @patch("dojo.api_v2.permissions.user_has_permission")
     def test_create_authorized_product_name_engagement_name_auto_create_engagement(self, mock, importer_mock, reimporter_mock):
-        """
-        Test creating a new engagement should also check for import scan permission in the product
-        """
+        """Test creating a new engagement should also check for import scan permission in the product"""
         mock.return_value = True
         importer_mock.return_value = IMPORTER_MOCK_RETURN_VALUE
         reimporter_mock.return_value = REIMPORTER_MOCK_RETURN_VALUE
diff --git a/unittests/tools/test_h1_parser.py b/unittests/tools/test_h1_parser.py
index 685220ff03..36f1ef1724 100644
--- a/unittests/tools/test_h1_parser.py
+++ b/unittests/tools/test_h1_parser.py
@@ -167,4 +167,5 @@ class TestHackerOneParser(
     HackerOneVulnerabilityDisclosureProgramTests,
     HackerOneBugBountyProgramTests,
 ):
+
     """Combined unit test runner."""
diff --git a/unittests/tools/test_sonarqube_parser.py b/unittests/tools/test_sonarqube_parser.py
index 352d001ca4..ffb05fb14d 100644
--- a/unittests/tools/test_sonarqube_parser.py
+++ b/unittests/tools/test_sonarqube_parser.py
@@ -366,7 +366,8 @@ def test_detailed_parse_file_with_vuln_on_same_filename(self):
         my_file_handle.close()
 
     def test_detailed_parse_file_with_vuln_issue_3725(self):
-        """SonarQube Scan detailed - report that crash
+        """
+        SonarQube Scan detailed - report that crash
         see: https://github.com/DefectDojo/django-DefectDojo/issues/3725
         """
         my_file_handle, _product, _engagement, test = self.init(get_unit_tests_path() + "/scans/sonarqube/sonar.html")
diff --git a/unittests/tools/test_spotbugs_parser.py b/unittests/tools/test_spotbugs_parser.py
index c6d26f9d52..7a549f3639 100644
--- a/unittests/tools/test_spotbugs_parser.py
+++ b/unittests/tools/test_spotbugs_parser.py
@@ -96,7 +96,8 @@ def test_references(self):
         )
 
     def test_version_4_4(self):
-        """There was a big difference between version < 4.4.x and after
+        """
+        There was a big difference between version < 4.4.x and after
         The dictionnary is not in the report anymore
         """
         testfile = open("unittests/scans/spotbugs/version_4.4.0.xml", encoding="utf-8")
diff --git a/unittests/tools/test_zap_parser.py b/unittests/tools/test_zap_parser.py
index fd209962ac..914bb05757 100644
--- a/unittests/tools/test_zap_parser.py
+++ b/unittests/tools/test_zap_parser.py
@@ -78,7 +78,8 @@ def test_parse_some_findings_5(self):
                     endpoint.clean()
 
     def test_parse_issue4360(self):
-        """Report from GitHub issue 4360
+        """
+        Report from GitHub issue 4360
         see: https://github.com/DefectDojo/django-DefectDojo/issues/4360
         """
         with open("unittests/scans/zap/dvwa_baseline_dojo.xml", encoding="utf-8") as testfile:
@@ -112,7 +113,8 @@ def test_parse_issue4360(self):
                 endpoint = finding.unsaved_endpoints[0]
 
     def test_parse_issue4697(self):
-        """Report from GitHub issue 4697
+        """
+        Report from GitHub issue 4697
         see: https://github.com/DefectDojo/django-DefectDojo/issues/4697
         """
         with open("unittests/scans/zap/zap-results-first-scan.xml", encoding="utf-8") as testfile: