diff --git a/monkey/monkey_island/cc/services/config.py b/monkey/monkey_island/cc/services/config.py
index 341297435..ac1ee1417 100644
--- a/monkey/monkey_island/cc/services/config.py
+++ b/monkey/monkey_island/cc/services/config.py
@@ -10,7 +10,6 @@ import monkey_island.cc.services.post_breach_files
 from monkey_island.cc.database import mongo
 from monkey_island.cc.encryptor import encryptor
 from monkey_island.cc.network_utils import local_ip_addresses
-
 from monkey_island.cc.services.config_schema.config_schema import SCHEMA
 
 __author__ = "itay.mizeretz"
diff --git a/monkey/monkey_island/cc/services/config_schema/config_schema.py b/monkey/monkey_island/cc/services/config_schema/config_schema.py
index d1cd7a68c..04e586e71 100644
--- a/monkey/monkey_island/cc/services/config_schema/config_schema.py
+++ b/monkey/monkey_island/cc/services/config_schema/config_schema.py
@@ -1,8 +1,11 @@
 from monkey_island.cc.services.config_schema.basic import BASIC
 from monkey_island.cc.services.config_schema.basic_network import BASIC_NETWORK
-from monkey_island.cc.services.config_schema.definitions.exploiter_classes import EXPLOITER_CLASSES
-from monkey_island.cc.services.config_schema.definitions.finger_classes import FINGER_CLASSES
-from monkey_island.cc.services.config_schema.definitions.post_breach_actions import POST_BREACH_ACTIONS
+from monkey_island.cc.services.config_schema.definitions.exploiter_classes import \
+    EXPLOITER_CLASSES
+from monkey_island.cc.services.config_schema.definitions.finger_classes import \
+    FINGER_CLASSES
+from monkey_island.cc.services.config_schema.definitions.post_breach_actions import \
+    POST_BREACH_ACTIONS
 from monkey_island.cc.services.config_schema.definitions.system_info_collector_classes import \
     SYSTEM_INFO_COLLECTOR_CLASSES
 from monkey_island.cc.services.config_schema.internal import INTERNAL
diff --git a/monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py b/monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py
index 8b960d1d8..5f113f4a7 100644
--- a/monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py
+++ b/monkey/monkey_island/cc/services/config_schema/definitions/system_info_collector_classes.py
@@ -1,9 +1,9 @@
 from common.data.system_info_collectors_names import (AWS_COLLECTOR,
+                                                      AZURE_CRED_COLLECTOR,
                                                       ENVIRONMENT_COLLECTOR,
                                                       HOSTNAME_COLLECTOR,
-                                                      PROCESS_LIST_COLLECTOR,
                                                       MIMIKATZ_COLLECTOR,
-                                                      AZURE_CRED_COLLECTOR)
+                                                      PROCESS_LIST_COLLECTOR)
 
 SYSTEM_INFO_COLLECTOR_CLASSES = {
     "title": "System Information Collectors",
diff --git a/monkey/monkey_island/cc/services/config_schema/monkey.py b/monkey/monkey_island/cc/services/config_schema/monkey.py
index 8e0ae9439..dd10cb35b 100644
--- a/monkey/monkey_island/cc/services/config_schema/monkey.py
+++ b/monkey/monkey_island/cc/services/config_schema/monkey.py
@@ -1,7 +1,9 @@
 from common.data.system_info_collectors_names import (AWS_COLLECTOR,
+                                                      AZURE_CRED_COLLECTOR,
                                                       ENVIRONMENT_COLLECTOR,
                                                       HOSTNAME_COLLECTOR,
-                                                      PROCESS_LIST_COLLECTOR, MIMIKATZ_COLLECTOR, AZURE_CRED_COLLECTOR)
+                                                      MIMIKATZ_COLLECTOR,
+                                                      PROCESS_LIST_COLLECTOR)
 
 MONKEY = {
     "title": "Monkey",