diff --git a/docs/developer-guide/services.md b/docs/developer-guide/services.md
index e4b5f092ec..6424fa8269 100644
--- a/docs/developer-guide/services.md
+++ b/docs/developer-guide/services.md
@@ -56,7 +56,6 @@ from prowler.providers.<provider>.lib.service.service import ServiceParentClass
 
 
 # Create a class for the Service
-################## <Service>
 class <Service>(ServiceParentClass):
     def __init__(self, provider):
         # Call Service Parent Class __init__
diff --git a/prowler/providers/aws/services/accessanalyzer/accessanalyzer_service.py b/prowler/providers/aws/services/accessanalyzer/accessanalyzer_service.py
index f3f2ac1d81..fbe6f3826e 100644
--- a/prowler/providers/aws/services/accessanalyzer/accessanalyzer_service.py
+++ b/prowler/providers/aws/services/accessanalyzer/accessanalyzer_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## AccessAnalyzer
 class AccessAnalyzer(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/account/account_service.py b/prowler/providers/aws/services/account/account_service.py
index d1054fbc3a..786d827e1a 100644
--- a/prowler/providers/aws/services/account/account_service.py
+++ b/prowler/providers/aws/services/account/account_service.py
@@ -1,4 +1,3 @@
-################## Account
 from typing import Optional
 from venv import logger
 
diff --git a/prowler/providers/aws/services/acm/acm_service.py b/prowler/providers/aws/services/acm/acm_service.py
index b5d85c44dd..ad69a32839 100644
--- a/prowler/providers/aws/services/acm/acm_service.py
+++ b/prowler/providers/aws/services/acm/acm_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## ACM
 class ACM(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/apigateway/apigateway_service.py b/prowler/providers/aws/services/apigateway/apigateway_service.py
index e38ec93208..c1525e0ea1 100644
--- a/prowler/providers/aws/services/apigateway/apigateway_service.py
+++ b/prowler/providers/aws/services/apigateway/apigateway_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## APIGateway
 class APIGateway(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/appstream/appstream_service.py b/prowler/providers/aws/services/appstream/appstream_service.py
index 919799dcd5..b1ee202bb9 100644
--- a/prowler/providers/aws/services/appstream/appstream_service.py
+++ b/prowler/providers/aws/services/appstream/appstream_service.py
@@ -7,7 +7,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## AppStream
 class AppStream(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/cloudformation/cloudformation_service.py b/prowler/providers/aws/services/cloudformation/cloudformation_service.py
index bb52a68e88..38caf5033f 100644
--- a/prowler/providers/aws/services/cloudformation/cloudformation_service.py
+++ b/prowler/providers/aws/services/cloudformation/cloudformation_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## CloudFormation
 class CloudFormation(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/cloudtrail/cloudtrail_service.py b/prowler/providers/aws/services/cloudtrail/cloudtrail_service.py
index 0aefc2aa14..b3f21522dc 100644
--- a/prowler/providers/aws/services/cloudtrail/cloudtrail_service.py
+++ b/prowler/providers/aws/services/cloudtrail/cloudtrail_service.py
@@ -9,7 +9,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################### CLOUDTRAIL
 class Cloudtrail(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/codeartifact/codeartifact_service.py b/prowler/providers/aws/services/codeartifact/codeartifact_service.py
index 3db36ecec0..c48b791390 100644
--- a/prowler/providers/aws/services/codeartifact/codeartifact_service.py
+++ b/prowler/providers/aws/services/codeartifact/codeartifact_service.py
@@ -9,7 +9,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## CodeArtifact
 class CodeArtifact(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/cognito/cognito_service.py b/prowler/providers/aws/services/cognito/cognito_service.py
index 392d2445bd..70075cad2e 100644
--- a/prowler/providers/aws/services/cognito/cognito_service.py
+++ b/prowler/providers/aws/services/cognito/cognito_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## CognitoIDP
 class CognitoIDP(AWSService):
     def __init__(self, provider):
         super().__init__("cognito-idp", provider)
diff --git a/prowler/providers/aws/services/directoryservice/directoryservice_service.py b/prowler/providers/aws/services/directoryservice/directoryservice_service.py
index d20bcf4eaa..8df5b1918e 100644
--- a/prowler/providers/aws/services/directoryservice/directoryservice_service.py
+++ b/prowler/providers/aws/services/directoryservice/directoryservice_service.py
@@ -10,7 +10,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## DirectoryService
 class DirectoryService(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/dlm/dlm_service.py b/prowler/providers/aws/services/dlm/dlm_service.py
index 4cdd546f9d..e06992660a 100644
--- a/prowler/providers/aws/services/dlm/dlm_service.py
+++ b/prowler/providers/aws/services/dlm/dlm_service.py
@@ -4,7 +4,6 @@ from prowler.lib.logger import logger
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## Data Lifecycle Manager
 class DLM(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/documentdb/documentdb_service.py b/prowler/providers/aws/services/documentdb/documentdb_service.py
index fad8b75e20..3beaf901d3 100644
--- a/prowler/providers/aws/services/documentdb/documentdb_service.py
+++ b/prowler/providers/aws/services/documentdb/documentdb_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## DocumentDB
 class DocumentDB(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/drs/drs_service.py b/prowler/providers/aws/services/drs/drs_service.py
index 83efa3432d..c3e99a6345 100644
--- a/prowler/providers/aws/services/drs/drs_service.py
+++ b/prowler/providers/aws/services/drs/drs_service.py
@@ -6,7 +6,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## DRS (Elastic Disaster Recovery Service)
 class DRS(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/ec2/lib/security_groups.py b/prowler/providers/aws/services/ec2/lib/security_groups.py
index c9bdc45405..af6dd6d50c 100644
--- a/prowler/providers/aws/services/ec2/lib/security_groups.py
+++ b/prowler/providers/aws/services/ec2/lib/security_groups.py
@@ -2,7 +2,6 @@ import ipaddress
 from typing import Any
 
 
-################## Security Groups
 def check_security_group(
     ingress_rule: Any, protocol: str, ports: list = [], any_address: bool = False
 ) -> bool:
diff --git a/prowler/providers/aws/services/ecr/ecr_service.py b/prowler/providers/aws/services/ecr/ecr_service.py
index bcbfeb532f..9cd6846d6d 100644
--- a/prowler/providers/aws/services/ecr/ecr_service.py
+++ b/prowler/providers/aws/services/ecr/ecr_service.py
@@ -10,7 +10,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ ECR
 class ECR(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/efs/efs_service.py b/prowler/providers/aws/services/efs/efs_service.py
index a48da26de5..51570de3c9 100644
--- a/prowler/providers/aws/services/efs/efs_service.py
+++ b/prowler/providers/aws/services/efs/efs_service.py
@@ -9,7 +9,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################### EFS
 class EFS(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/eks/eks_service.py b/prowler/providers/aws/services/eks/eks_service.py
index 68cd9102ac..4731887a02 100644
--- a/prowler/providers/aws/services/eks/eks_service.py
+++ b/prowler/providers/aws/services/eks/eks_service.py
@@ -7,7 +7,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ EKS
 class EKS(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/eventbridge/eventbridge_service.py b/prowler/providers/aws/services/eventbridge/eventbridge_service.py
index 6cf0addd47..58b717d05d 100644
--- a/prowler/providers/aws/services/eventbridge/eventbridge_service.py
+++ b/prowler/providers/aws/services/eventbridge/eventbridge_service.py
@@ -9,7 +9,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ EventBridge
 class EventBridge(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
@@ -123,7 +122,6 @@ class Endpoint(BaseModel):
     tags: Optional[list] = []
 
 
-################################ Schema
 class Schema(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/fms/fms_service.py b/prowler/providers/aws/services/fms/fms_service.py
index 64afc350ea..443fde4a47 100644
--- a/prowler/providers/aws/services/fms/fms_service.py
+++ b/prowler/providers/aws/services/fms/fms_service.py
@@ -6,7 +6,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## FMS
 class FMS(AWSService):
     def __init__(self, provider):
         # # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/glacier/glacier_service.py b/prowler/providers/aws/services/glacier/glacier_service.py
index 70472dc5b6..9281f7485b 100644
--- a/prowler/providers/aws/services/glacier/glacier_service.py
+++ b/prowler/providers/aws/services/glacier/glacier_service.py
@@ -9,7 +9,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## Glacier
 class Glacier(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/inspector2/inspector2_service.py b/prowler/providers/aws/services/inspector2/inspector2_service.py
index 35626bc926..5bebe96fcd 100644
--- a/prowler/providers/aws/services/inspector2/inspector2_service.py
+++ b/prowler/providers/aws/services/inspector2/inspector2_service.py
@@ -4,7 +4,6 @@ from prowler.lib.logger import logger
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ Inspector2
 class Inspector2(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/kms/kms_service.py b/prowler/providers/aws/services/kms/kms_service.py
index 7678543be2..4cd71fbc9d 100644
--- a/prowler/providers/aws/services/kms/kms_service.py
+++ b/prowler/providers/aws/services/kms/kms_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## KMS
 class KMS(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/macie/macie_service.py b/prowler/providers/aws/services/macie/macie_service.py
index 9327946c64..a11c78f940 100644
--- a/prowler/providers/aws/services/macie/macie_service.py
+++ b/prowler/providers/aws/services/macie/macie_service.py
@@ -4,7 +4,6 @@ from prowler.lib.logger import logger
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## Macie
 class Macie(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/neptune/neptune_service.py b/prowler/providers/aws/services/neptune/neptune_service.py
index 90b8969aa4..1c48d713ba 100644
--- a/prowler/providers/aws/services/neptune/neptune_service.py
+++ b/prowler/providers/aws/services/neptune/neptune_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## Neptune
 class Neptune(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/rds/rds_service.py b/prowler/providers/aws/services/rds/rds_service.py
index 60d24b1cb1..819d15660b 100644
--- a/prowler/providers/aws/services/rds/rds_service.py
+++ b/prowler/providers/aws/services/rds/rds_service.py
@@ -9,7 +9,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## RDS
 class RDS(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_service.py b/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_service.py
index a2b2db1e85..8fe0b413f6 100644
--- a/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_service.py
+++ b/prowler/providers/aws/services/resourceexplorer2/resourceexplorer2_service.py
@@ -6,7 +6,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ ResourceExplorer2
 class ResourceExplorer2(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/route53/route53_service.py b/prowler/providers/aws/services/route53/route53_service.py
index 374ee63351..2c6a2cd786 100644
--- a/prowler/providers/aws/services/route53/route53_service.py
+++ b/prowler/providers/aws/services/route53/route53_service.py
@@ -7,7 +7,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## Route53
 class Route53(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
@@ -137,7 +136,6 @@ class RecordSet(BaseModel):
     region: str
 
 
-################## Route53Domains
 class Route53Domains(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/sagemaker/sagemaker_service.py b/prowler/providers/aws/services/sagemaker/sagemaker_service.py
index 4591fa994d..0ca95f8a2a 100644
--- a/prowler/providers/aws/services/sagemaker/sagemaker_service.py
+++ b/prowler/providers/aws/services/sagemaker/sagemaker_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ SageMaker
 class SageMaker(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/shield/shield_service.py b/prowler/providers/aws/services/shield/shield_service.py
index ea118135b7..06129a94a6 100644
--- a/prowler/providers/aws/services/shield/shield_service.py
+++ b/prowler/providers/aws/services/shield/shield_service.py
@@ -4,7 +4,6 @@ from prowler.lib.logger import logger
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################### Shield
 class Shield(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/sqs/sqs_service.py b/prowler/providers/aws/services/sqs/sqs_service.py
index 3cdc93b055..5371ab9c98 100644
--- a/prowler/providers/aws/services/sqs/sqs_service.py
+++ b/prowler/providers/aws/services/sqs/sqs_service.py
@@ -9,7 +9,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ SQS
 class SQS(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/ssm/ssm_service.py b/prowler/providers/aws/services/ssm/ssm_service.py
index 3b5dc13c7f..3f8c62d6f5 100644
--- a/prowler/providers/aws/services/ssm/ssm_service.py
+++ b/prowler/providers/aws/services/ssm/ssm_service.py
@@ -11,7 +11,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## SSM
 class SSM(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/ssmincidents/ssmincidents_service.py b/prowler/providers/aws/services/ssmincidents/ssmincidents_service.py
index 4700c94a10..fd6dce7b62 100644
--- a/prowler/providers/aws/services/ssmincidents/ssmincidents_service.py
+++ b/prowler/providers/aws/services/ssmincidents/ssmincidents_service.py
@@ -12,7 +12,6 @@ from prowler.providers.aws.lib.service.service import AWSService
 # Because we need to do a get_replication_set to describe it and we don't know the region, we iterate across all regions until we find it, once we find it, we stop iterating.
 
 
-################## SSMIncidents
 class SSMIncidents(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/storagegateway/storagegateway_service.py b/prowler/providers/aws/services/storagegateway/storagegateway_service.py
index a0cb6f3928..b375b87282 100644
--- a/prowler/providers/aws/services/storagegateway/storagegateway_service.py
+++ b/prowler/providers/aws/services/storagegateway/storagegateway_service.py
@@ -7,7 +7,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ StorageGateway
 class StorageGateway(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py b/prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py
index e26f2fcbe4..4dd899c0ca 100644
--- a/prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py
+++ b/prowler/providers/aws/services/trustedadvisor/trustedadvisor_service.py
@@ -7,7 +7,6 @@ from prowler.lib.logger import logger
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ TrustedAdvisor
 class TrustedAdvisor(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/vpc/vpc_service.py b/prowler/providers/aws/services/vpc/vpc_service.py
index 4a4db376ba..350dbdcd10 100644
--- a/prowler/providers/aws/services/vpc/vpc_service.py
+++ b/prowler/providers/aws/services/vpc/vpc_service.py
@@ -9,7 +9,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################## VPC
 class VPC(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/wellarchitected/wellarchitected_service.py b/prowler/providers/aws/services/wellarchitected/wellarchitected_service.py
index b8cb563252..3e8951d8c0 100644
--- a/prowler/providers/aws/services/wellarchitected/wellarchitected_service.py
+++ b/prowler/providers/aws/services/wellarchitected/wellarchitected_service.py
@@ -8,7 +8,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ WellArchitected
 class WellArchitected(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/aws/services/workspaces/workspaces_service.py b/prowler/providers/aws/services/workspaces/workspaces_service.py
index ed941bf75c..48617897ff 100644
--- a/prowler/providers/aws/services/workspaces/workspaces_service.py
+++ b/prowler/providers/aws/services/workspaces/workspaces_service.py
@@ -7,7 +7,6 @@ from prowler.lib.scan_filters.scan_filters import is_resource_filtered
 from prowler.providers.aws.lib.service.service import AWSService
 
 
-################################ WorkSpaces
 class WorkSpaces(AWSService):
     def __init__(self, provider):
         # Call AWSService's __init__
diff --git a/prowler/providers/azure/services/appinsights/appinsights_service.py b/prowler/providers/azure/services/appinsights/appinsights_service.py
index 83738083ed..f101a5e40b 100644
--- a/prowler/providers/azure/services/appinsights/appinsights_service.py
+++ b/prowler/providers/azure/services/appinsights/appinsights_service.py
@@ -6,7 +6,6 @@ from prowler.providers.azure.azure_provider import AzureProvider
 from prowler.providers.azure.lib.service.service import AzureService
 
 
-########################## AppInsights
 class AppInsights(AzureService):
     def __init__(self, provider: AzureProvider):
         super().__init__(ApplicationInsightsManagementClient, provider)
diff --git a/prowler/providers/azure/services/storage/storage_service.py b/prowler/providers/azure/services/storage/storage_service.py
index 5d189bb7fc..63b5fcf64c 100644
--- a/prowler/providers/azure/services/storage/storage_service.py
+++ b/prowler/providers/azure/services/storage/storage_service.py
@@ -12,7 +12,6 @@ from prowler.providers.azure.azure_provider import AzureProvider
 from prowler.providers.azure.lib.service.service import AzureService
 
 
-########################## Storage
 class Storage(AzureService):
     def __init__(self, provider: AzureProvider):
         super().__init__(StorageManagementClient, provider)
diff --git a/prowler/providers/gcp/services/apikeys/apikeys_service.py b/prowler/providers/gcp/services/apikeys/apikeys_service.py
index ce1fbaa4b3..73dc504ede 100644
--- a/prowler/providers/gcp/services/apikeys/apikeys_service.py
+++ b/prowler/providers/gcp/services/apikeys/apikeys_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## API Keys
 class APIKeys(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider, api_version="v2")
diff --git a/prowler/providers/gcp/services/bigquery/bigquery_service.py b/prowler/providers/gcp/services/bigquery/bigquery_service.py
index b26ffc46ea..e06b976dc0 100644
--- a/prowler/providers/gcp/services/bigquery/bigquery_service.py
+++ b/prowler/providers/gcp/services/bigquery/bigquery_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## BigQuery
 class BigQuery(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider, api_version="v2")
diff --git a/prowler/providers/gcp/services/cloudresourcemanager/cloudresourcemanager_service.py b/prowler/providers/gcp/services/cloudresourcemanager/cloudresourcemanager_service.py
index 154c5bc6ba..472806df04 100644
--- a/prowler/providers/gcp/services/cloudresourcemanager/cloudresourcemanager_service.py
+++ b/prowler/providers/gcp/services/cloudresourcemanager/cloudresourcemanager_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## CloudResourceManager
 class CloudResourceManager(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider)
diff --git a/prowler/providers/gcp/services/cloudsql/cloudsql_service.py b/prowler/providers/gcp/services/cloudsql/cloudsql_service.py
index 7bc1f73bf4..539671173b 100644
--- a/prowler/providers/gcp/services/cloudsql/cloudsql_service.py
+++ b/prowler/providers/gcp/services/cloudsql/cloudsql_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## CloudSQL
 class CloudSQL(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__("sqladmin", provider)
diff --git a/prowler/providers/gcp/services/cloudstorage/cloudstorage_service.py b/prowler/providers/gcp/services/cloudstorage/cloudstorage_service.py
index 51cd9498dd..0e2e74d27c 100644
--- a/prowler/providers/gcp/services/cloudstorage/cloudstorage_service.py
+++ b/prowler/providers/gcp/services/cloudstorage/cloudstorage_service.py
@@ -7,7 +7,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## CloudStorage
 class CloudStorage(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__("storage", provider)
diff --git a/prowler/providers/gcp/services/compute/compute_service.py b/prowler/providers/gcp/services/compute/compute_service.py
index 3ce461e0a0..765192877f 100644
--- a/prowler/providers/gcp/services/compute/compute_service.py
+++ b/prowler/providers/gcp/services/compute/compute_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## Compute
 class Compute(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider)
diff --git a/prowler/providers/gcp/services/dataproc/dataproc_service.py b/prowler/providers/gcp/services/dataproc/dataproc_service.py
index 6c57763832..68c05e407a 100644
--- a/prowler/providers/gcp/services/dataproc/dataproc_service.py
+++ b/prowler/providers/gcp/services/dataproc/dataproc_service.py
@@ -6,7 +6,6 @@ from prowler.providers.gcp.lib.service.service import GCPService
 from prowler.providers.gcp.services.compute.compute_client import compute_client
 
 
-################## Dataproc
 class Dataproc(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider)
diff --git a/prowler/providers/gcp/services/dns/dns_service.py b/prowler/providers/gcp/services/dns/dns_service.py
index 15c853448d..5783dbf137 100644
--- a/prowler/providers/gcp/services/dns/dns_service.py
+++ b/prowler/providers/gcp/services/dns/dns_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## DNS
 class DNS(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider)
diff --git a/prowler/providers/gcp/services/gke/gke_service.py b/prowler/providers/gcp/services/gke/gke_service.py
index ecd351c93f..a9b42ca046 100644
--- a/prowler/providers/gcp/services/gke/gke_service.py
+++ b/prowler/providers/gcp/services/gke/gke_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## GKE
 class GKE(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__("container", provider, api_version="v1beta1")
diff --git a/prowler/providers/gcp/services/iam/iam_service.py b/prowler/providers/gcp/services/iam/iam_service.py
index 77291563ce..d6f696d6aa 100644
--- a/prowler/providers/gcp/services/iam/iam_service.py
+++ b/prowler/providers/gcp/services/iam/iam_service.py
@@ -10,7 +10,6 @@ from prowler.providers.gcp.services.cloudresourcemanager.cloudresourcemanager_cl
 )
 
 
-################## IAM
 class IAM(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider)
@@ -102,7 +101,6 @@ class ServiceAccount(BaseModel):
     project_id: str
 
 
-################## AccessApproval
 class AccessApproval(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider)
@@ -133,7 +131,6 @@ class Setting(BaseModel):
     project_id: str
 
 
-################## EssentialContacts
 class EssentialContacts(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider)
diff --git a/prowler/providers/gcp/services/kms/kms_service.py b/prowler/providers/gcp/services/kms/kms_service.py
index 228605f036..3ac498d2ba 100644
--- a/prowler/providers/gcp/services/kms/kms_service.py
+++ b/prowler/providers/gcp/services/kms/kms_service.py
@@ -7,7 +7,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## KMS
 class KMS(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__("cloudkms", provider)
diff --git a/prowler/providers/gcp/services/logging/logging_service.py b/prowler/providers/gcp/services/logging/logging_service.py
index 9e0aac38b0..98f0fd1fba 100644
--- a/prowler/providers/gcp/services/logging/logging_service.py
+++ b/prowler/providers/gcp/services/logging/logging_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## Logging
 class Logging(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider, api_version="v2")
diff --git a/prowler/providers/gcp/services/monitoring/monitoring_service.py b/prowler/providers/gcp/services/monitoring/monitoring_service.py
index bb294eec4a..89ae2d1ea2 100644
--- a/prowler/providers/gcp/services/monitoring/monitoring_service.py
+++ b/prowler/providers/gcp/services/monitoring/monitoring_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## Monitoring
 class Monitoring(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider, api_version="v3")
diff --git a/prowler/providers/gcp/services/serviceusage/serviceusage_service.py b/prowler/providers/gcp/services/serviceusage/serviceusage_service.py
index 04dd45e0a1..f4e8ab8732 100644
--- a/prowler/providers/gcp/services/serviceusage/serviceusage_service.py
+++ b/prowler/providers/gcp/services/serviceusage/serviceusage_service.py
@@ -5,7 +5,6 @@ from prowler.providers.gcp.gcp_provider import GcpProvider
 from prowler.providers.gcp.lib.service.service import GCPService
 
 
-################## ServiceUsage
 class ServiceUsage(GCPService):
     def __init__(self, provider: GcpProvider):
         super().__init__(__class__.__name__, provider)
diff --git a/prowler/providers/kubernetes/services/apiserver/apiserver_service.py b/prowler/providers/kubernetes/services/apiserver/apiserver_service.py
index 45424d13db..75f20c5afb 100644
--- a/prowler/providers/kubernetes/services/apiserver/apiserver_service.py
+++ b/prowler/providers/kubernetes/services/apiserver/apiserver_service.py
@@ -4,7 +4,6 @@ from prowler.providers.kubernetes.lib.service.service import KubernetesService
 from prowler.providers.kubernetes.services.core.core_client import core_client
 
 
-################## APIServer ##################
 class APIServer(KubernetesService):
     def __init__(self, provider: KubernetesProvider):
         super().__init__(provider)
diff --git a/prowler/providers/kubernetes/services/controllermanager/controllermanager_service.py b/prowler/providers/kubernetes/services/controllermanager/controllermanager_service.py
index f7ec0d82f8..31b342fc7d 100644
--- a/prowler/providers/kubernetes/services/controllermanager/controllermanager_service.py
+++ b/prowler/providers/kubernetes/services/controllermanager/controllermanager_service.py
@@ -4,7 +4,6 @@ from prowler.providers.kubernetes.lib.service.service import KubernetesService
 from prowler.providers.kubernetes.services.core.core_client import core_client
 
 
-################## ControllerManager ##################
 class ControllerManager(KubernetesService):
     def __init__(self, provider: KubernetesProvider):
         super().__init__(provider)
diff --git a/prowler/providers/kubernetes/services/core/core_service.py b/prowler/providers/kubernetes/services/core/core_service.py
index bcdb062237..42c7d85376 100644
--- a/prowler/providers/kubernetes/services/core/core_service.py
+++ b/prowler/providers/kubernetes/services/core/core_service.py
@@ -11,7 +11,6 @@ from prowler.providers.kubernetes.kubernetes_provider import KubernetesProvider
 from prowler.providers.kubernetes.lib.service.service import KubernetesService
 
 
-################## Core ##################
 class Core(KubernetesService):
     def __init__(self, provider: KubernetesProvider):
         super().__init__(provider)
diff --git a/prowler/providers/kubernetes/services/etcd/etcd_service.py b/prowler/providers/kubernetes/services/etcd/etcd_service.py
index 2aa1df8219..1508a0a501 100644
--- a/prowler/providers/kubernetes/services/etcd/etcd_service.py
+++ b/prowler/providers/kubernetes/services/etcd/etcd_service.py
@@ -4,7 +4,6 @@ from prowler.providers.kubernetes.lib.service.service import KubernetesService
 from prowler.providers.kubernetes.services.core.core_client import core_client
 
 
-################## Etcd ##################
 class Etcd(KubernetesService):
     def __init__(self, provider: KubernetesProvider):
         super().__init__(provider)
diff --git a/prowler/providers/kubernetes/services/kubelet/kubelet_service.py b/prowler/providers/kubernetes/services/kubelet/kubelet_service.py
index 99346d5b7a..b5e3227f8d 100644
--- a/prowler/providers/kubernetes/services/kubelet/kubelet_service.py
+++ b/prowler/providers/kubernetes/services/kubelet/kubelet_service.py
@@ -6,7 +6,6 @@ from prowler.providers.kubernetes.lib.service.service import KubernetesService
 from prowler.providers.kubernetes.services.core.core_client import core_client
 
 
-################## Kubelet ##################
 class Kubelet(KubernetesService):
     def __init__(self, provider: KubernetesProvider):
         super().__init__(provider)
diff --git a/prowler/providers/kubernetes/services/rbac/rbac_service.py b/prowler/providers/kubernetes/services/rbac/rbac_service.py
index 369aab7a8b..5dc16ba37d 100644
--- a/prowler/providers/kubernetes/services/rbac/rbac_service.py
+++ b/prowler/providers/kubernetes/services/rbac/rbac_service.py
@@ -8,7 +8,6 @@ from prowler.providers.kubernetes.kubernetes_provider import KubernetesProvider
 from prowler.providers.kubernetes.lib.service.service import KubernetesService
 
 
-################## Rbac ##################
 class Rbac(KubernetesService):
     def __init__(self, provider: KubernetesProvider):
         super().__init__(provider)
diff --git a/prowler/providers/kubernetes/services/scheduler/scheduler_service.py b/prowler/providers/kubernetes/services/scheduler/scheduler_service.py
index 7cf31a093b..95b442976b 100644
--- a/prowler/providers/kubernetes/services/scheduler/scheduler_service.py
+++ b/prowler/providers/kubernetes/services/scheduler/scheduler_service.py
@@ -4,7 +4,6 @@ from prowler.providers.kubernetes.lib.service.service import KubernetesService
 from prowler.providers.kubernetes.services.core.core_client import core_client
 
 
-################## Scheduler ##################
 class Scheduler(KubernetesService):
     def __init__(self, provider: KubernetesProvider):
         super().__init__(provider)