diff --git a/monkey_island/cc/environment/environment.py b/monkey_island/cc/environment/environment.py
index ebe456b3e..094b9c235 100644
--- a/monkey_island/cc/environment/environment.py
+++ b/monkey_island/cc/environment/environment.py
@@ -22,7 +22,7 @@ def load_env_from_file():
 try:
     __env_type = load_env_from_file()
     env = ENV_DICT[__env_type]()
-    logger.info('Monkey\'s env is: {0}'.format(env))
+    logger.info('Monkey\'s env is: {0}'.format(env.__class__.__name__))
 except Exception:
     logger.error('Failed initializing environment', exc_info=True)
     raise
diff --git a/monkey_island/cc/main.py b/monkey_island/cc/main.py
index 41e2ba576..c1133a9c8 100644
--- a/monkey_island/cc/main.py
+++ b/monkey_island/cc/main.py
@@ -9,11 +9,15 @@ BASE_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 if BASE_PATH not in sys.path:
     sys.path.insert(0, BASE_PATH)
 
+from cc.island_logger import json_setup_logging
+# This is here in order to catch EVERYTHING, some functions are being called on imports the log init needs to be on top.
+json_setup_logging(default_path='island_logger_default_config.json', default_level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
 from cc.app import init_app
 from cc.utils import local_ip_addresses
 from cc.environment.environment import env
 from cc.database import is_db_server_up
-from cc.island_logger import json_setup_logging
 
 
 def main():
@@ -21,9 +25,6 @@ def main():
     from tornado.httpserver import HTTPServer
     from tornado.ioloop import IOLoop
 
-    json_setup_logging(default_path='island_logger_default_config.json', default_level=logging.DEBUG)
-    logger = logging.getLogger(__name__)
-
     mongo_url = os.environ.get('MONGO_URL', env.get_mongo_url())
 
     while not is_db_server_up(mongo_url):
diff --git a/monkey_island/cc/resources/client_run.py b/monkey_island/cc/resources/client_run.py
index c2e44c9aa..0e4be42e7 100644
--- a/monkey_island/cc/resources/client_run.py
+++ b/monkey_island/cc/resources/client_run.py
@@ -20,7 +20,7 @@ class ClientRun(flask_restful.Resource):
         if monkey is not None:
             is_monkey_running = not monkey["dead"]
         else:
-            logger.info("")
+            logger.info("Monkey is not running")
             is_monkey_running = False
 
         return jsonify(is_running=is_monkey_running)
diff --git a/monkey_island/cc/resources/island_logs.py b/monkey_island/cc/resources/island_logs.py
index 1ca1a8cdf..971306c14 100644
--- a/monkey_island/cc/resources/island_logs.py
+++ b/monkey_island/cc/resources/island_logs.py
@@ -1,6 +1,7 @@
-import flask_restful
 import logging
 
+import flask_restful
+
 from cc.auth import jwt_required
 from cc.services.island_logs import IslandLogService
 
@@ -16,4 +17,3 @@ class IslandLog(flask_restful.Resource):
             return IslandLogService.get_log_file()
         except Exception as e:
             logger.error('Monkey Island logs failed to download', exc_info=True)
-
diff --git a/monkey_island/cc/resources/monkey_configuration.py b/monkey_island/cc/resources/monkey_configuration.py
index 22492344b..6dab8dddb 100644
--- a/monkey_island/cc/resources/monkey_configuration.py
+++ b/monkey_island/cc/resources/monkey_configuration.py
@@ -19,7 +19,6 @@ class MonkeyConfiguration(flask_restful.Resource):
         config_json = json.loads(request.data)
         if 'reset' in config_json:
             ConfigService.reset_config()
-
         else:
             ConfigService.update_config(config_json, should_encrypt=True)
         return self.get()