diff --git a/.travis.yml b/.travis.yml
index 3b5a59f6f..a73629f99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ script:
 ## Display the linter issues
 - cat flake8_warnings.txt
 ## Make sure that we haven't increased the amount of warnings.
-- PYTHON_WARNINGS_AMOUNT_UPPER_LIMIT=100
+- PYTHON_WARNINGS_AMOUNT_UPPER_LIMIT=120
 - if [ $(tail -n 1 flake8_warnings.txt) -gt $PYTHON_WARNINGS_AMOUNT_UPPER_LIMIT ]; then echo "Too many python linter warnings! Failing this build. Lower the amount of linter errors in this and try again. " && exit 1; fi
 
 ## Run unit tests
diff --git a/envs/monkey_zoo/blackbox/island_client/monkey_island_client.py b/envs/monkey_zoo/blackbox/island_client/monkey_island_client.py
index 93780bf3b..f7d6f552c 100644
--- a/envs/monkey_zoo/blackbox/island_client/monkey_island_client.py
+++ b/envs/monkey_zoo/blackbox/island_client/monkey_island_client.py
@@ -1,4 +1,3 @@
-from datetime import timedelta
 from time import sleep
 import json
 
diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py
index 04e510c55..5109c7652 100644
--- a/envs/monkey_zoo/blackbox/test_blackbox.py
+++ b/envs/monkey_zoo/blackbox/test_blackbox.py
@@ -144,4 +144,3 @@ class TestMonkeyBlackbox(object):
                                                 island_client,
                                                 "PERFORMANCE.conf",
                                                 timeout_in_seconds=10*60)
-
diff --git a/envs/os_compatibility/test_compatibility.py b/envs/os_compatibility/test_compatibility.py
index 51a9f5ebb..5e5a38597 100644
--- a/envs/os_compatibility/test_compatibility.py
+++ b/envs/os_compatibility/test_compatibility.py
@@ -57,6 +57,3 @@ class TestOSCompatibility(object):
 
         if len(ips_that_communicated) < len(machine_list):
             assert False
-
-
-
diff --git a/monkey/infection_monkey/exploit/win_ms08_067.py b/monkey/infection_monkey/exploit/win_ms08_067.py
index f296091d6..8379b6d4f 100644
--- a/monkey/infection_monkey/exploit/win_ms08_067.py
+++ b/monkey/infection_monkey/exploit/win_ms08_067.py
@@ -193,9 +193,9 @@ class Ms08_067_Exploiter(HostExploiter):
 
                 sock.send("cmd /c (net user {} {} /add) &&"
                           " (net localgroup administrators {} /add)\r\n".format(
-                    self._config.user_to_add,
-                    self._config.remote_user_pass,
-                    self._config.user_to_add).encode())
+                            self._config.user_to_add,
+                            self._config.remote_user_pass,
+                            self._config.user_to_add).encode())
                 time.sleep(2)
                 reply = sock.recv(1000)
 
diff --git a/monkey/monkey_island/cc/models/test_monkey.py b/monkey/monkey_island/cc/models/test_monkey.py
index 0d12f9785..b25208345 100644
--- a/monkey/monkey_island/cc/models/test_monkey.py
+++ b/monkey/monkey_island/cc/models/test_monkey.py
@@ -13,8 +13,8 @@ logger = logging.getLogger(__name__)
 
 class TestMonkey(IslandTestCase):
     """
-    Make sure to set server environment to `testing` in server_config.json! Otherwise this will mess up your mongo instance and
-    won't work.
+    Make sure to set server environment to `testing` in server_config.json!
+    Otherwise this will mess up your mongo instance and won't work.
 
     Also, the working directory needs to be the working directory from which you usually run the island so the
     server_config.json file is found and loaded.
diff --git a/monkey/monkey_island/cc/resources/bootloader_test.py b/monkey/monkey_island/cc/resources/bootloader_test.py
index 41ce9304c..5db86627c 100644
--- a/monkey/monkey_island/cc/resources/bootloader_test.py
+++ b/monkey/monkey_island/cc/resources/bootloader_test.py
@@ -1,7 +1,6 @@
 from unittest import TestCase
 
 from monkey_island.cc.resources.bootloader import Bootloader
-from monkey_island.cc.services.utils.bootloader_config import SUPPORTED_WINDOWS_VERSIONS
 
 
 class TestBootloader(TestCase):
diff --git a/monkey/monkey_island/cc/services/config_schema.py b/monkey/monkey_island/cc/services/config_schema.py
index 3d0220ee2..6b797c206 100644
--- a/monkey/monkey_island/cc/services/config_schema.py
+++ b/monkey/monkey_island/cc/services/config_schema.py
@@ -130,7 +130,7 @@ SCHEMA = {
                     "title": "Collect the machine's hostname",
                     "attack_techniques": []
                 },
-{
+                {
                     "type": "string",
                     "enum": [
                         PROCESS_LIST_COLLECTOR