diff --git a/docs/conf.py b/docs/conf.py
index 4690447..e801795 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -249,27 +249,27 @@ htmlhelp_basename = 'kasdoc'
 html_context = {
     'extra_css_files': [
         '_static/theme_overrides.css',  # override wide tables in RTD theme
-     ],
+    ],
 }
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-     # The paper size ('letterpaper' or 'a4paper').
-     #
-     # 'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
 
-     # The font size ('10pt', '11pt' or '12pt').
-     #
-     # 'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
 
-     # Additional stuff for the LaTeX preamble.
-     #
-     # 'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
 
-     # Latex figure (float) alignment
-     #
-     # 'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
diff --git a/kas/build.py b/kas/build.py
index 316d486..f886ab5 100644
--- a/kas/build.py
+++ b/kas/build.py
@@ -120,6 +120,6 @@ class BuildCommand(Command):
         """
         # Start bitbake build of image
         bitbake = find_program(config.environ['PATH'], 'bitbake')
-        run_cmd([bitbake, '-k', '-c', config.get_bitbake_task()] +
-                config.get_bitbake_targets(),
+        run_cmd(([bitbake, '-k', '-c', config.get_bitbake_task()]
+                 + config.get_bitbake_targets()),
                 env=config.environ, cwd=config.build_dir)
diff --git a/kas/configschema.py b/kas/configschema.py
index b760965..69e7e81 100644
--- a/kas/configschema.py
+++ b/kas/configschema.py
@@ -45,8 +45,8 @@ CONFIGSCHEMA = {
                         {
                             'type': 'integer',
                         },
-                        ],
-                    },
+                    ],
+                },
                 'includes': {
                     'type': 'array',
                     'items': {
diff --git a/scripts/checkcode.sh b/scripts/checkcode.sh
index 80f0a0a..0c4dee5 100755
--- a/scripts/checkcode.sh
+++ b/scripts/checkcode.sh
@@ -3,7 +3,7 @@
 ERROR=0
 
 echo "Checking with pycodestyle"
-pycodestyle $1/*.py $1/*/*.py || ERROR=$(expr $ERROR + 1)
+pycodestyle --ignore=W503,W606 $1/*.py $1/*/*.py || ERROR=$(expr $ERROR + 1)
 
 echo "Checking with pylint"
 pylint $1/*.py $1/*/*.py || ERROR=$(expr $ERROR + 2)
diff --git a/tests/test_includehandler.py b/tests/test_includehandler.py
index cfa4633..5046e8d 100644
--- a/tests/test_includehandler.py
+++ b/tests/test_includehandler.py
@@ -79,7 +79,7 @@ class TestLoadConfig(object):
             ('a', exception),
             ('1', exception),
             ('a:', exception)
-            ]
+        ]
 
         self.util_exception_content(testvector)
 
@@ -118,7 +118,7 @@ class TestLoadConfig(object):
         testvector = [
             'header: {version: 4}',
             'header: {version: 5}',
-            ]
+        ]
         for string in testvector:
             with patch_open(includehandler, string=string):
                 includehandler.load_config('x.yml')