diff --git a/bootstrap.py b/bootstrap.py
index 01d0052..37a65f4 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -143,7 +143,7 @@
     options.find_links or
     ('http://downloads.buildout.org/'
      if options.accept_buildout_test_releases else None)
-    )
+)
 if find_links:
     cmd.extend(['-f', find_links])
 
@@ -207,4 +207,5 @@ def _final_version(parsed_version):
     args[0:0] = ['-c', options.config_file]
 
 zc.buildout.buildout.main(args)
-shutil.rmtree(tmpeggs)
\ No newline at end of file
+shutil.rmtree(tmpeggs)
+
diff --git a/internal_test.py b/internal_test.py
index d7f234c..5a1f347 100644
--- a/internal_test.py
+++ b/internal_test.py
@@ -135,7 +135,8 @@ def test_01_general_workflow(self):
         # Move assets to pending ==============================================
         for asset in assets:
             asset_id = asset.data.id
-            self.assets_client.patch_asset(asset.data.id, {"data": {"status": "pending"}}, asset.access.token)
+            self.assets_client.patch_asset(
+                asset.data.id, {"data": {"status": "pending"}}, asset.access.token)
             self.assertEqual(self.assets_client.get_asset(asset_id).data.status,
                              "pending")
 
@@ -152,14 +153,18 @@ def test_01_general_workflow(self):
         print "Successfully created lot [{}]".format(lot.data.id)
 
         # Move lot to Pending =================================================
-        self.lots_client.patch_lot(lot.data.id, {"data": {"status": "pending"}}, lot.access.token)
-        self.assertEqual(self.lots_client.get_lot(lot.data.id).data.status, "pending")
+        self.lots_client.patch_lot(
+            lot.data.id, {"data": {"status": "pending"}}, lot.access.token)
+        self.assertEqual(self.lots_client.get_lot(
+            lot.data.id).data.status, "pending")
 
         print "Moved lot to 'pending' status"
 
         # Move lot to Verification ============================================
-        self.lots_client.patch_lot(lot.data.id, {"data": {"status": "verification"}}, lot.access.token)
-        self.assertEqual(self.lots_client.get_lot(lot.data.id).data.status, "verification")
+        self.lots_client.patch_lot(
+            lot.data.id, {"data": {"status": "verification"}}, lot.access.token)
+        self.assertEqual(self.lots_client.get_lot(
+            lot.data.id).data.status, "verification")
 
         print "Moved lot to 'verification' status"
 
@@ -218,7 +223,8 @@ def test_01_general_workflow(self):
         # print "Convoy has moved lot to 'active.salable' status and done his work!"
 
         # Move lot to dissolved status ========================================
-        self.lots_client.patch_lot(lot.data.id, {"data": {"status": "pending.dissolution"}}, lot.access.token)
+        self.lots_client.patch_lot(
+            lot.data.id, {"data": {"status": "pending.dissolution"}}, lot.access.token)
         lot_status = self.lots_client.get_lot(lot.data.id).data.status
         self.assertEqual(lot_status, "pending.dissolution")
 
diff --git a/profiles/development.cfg b/profiles/development.cfg
index d8c2614..14335d2 100644
--- a/profiles/development.cfg
+++ b/profiles/development.cfg
@@ -82,4 +82,4 @@ input = inline:
     #!/bin/bash
     find -L src -type f -regex ".*\.py" | xargs bin/pylint-bin $@
 output = ${buildout:directory}/bin/pylint
-mode = 755
\ No newline at end of file
+mode = 755
diff --git a/start.py b/start.py
index 58e4e5d..e7740d6 100644
--- a/start.py
+++ b/start.py
@@ -1,4 +1,7 @@
-import ConfigParser, os, uuid, subprocess
+import ConfigParser
+import os
+import uuid
+import subprocess
 
 
 cur_dir = os.path.dirname(__file__)
@@ -12,4 +15,5 @@
     with open(couchdb_ini_file_path, 'wb') as configfile:
         config.write(configfile)
 
-subprocess.check_call([os.path.join(cur_dir, 'bin/circusd'), "--daemon"])
\ No newline at end of file
+subprocess.check_call([os.path.join(cur_dir, 'bin/circusd'), "--daemon"])
+
diff --git a/templates/couchdb.ini b/templates/couchdb.ini
index 828b3f6..c6fe55c 100644
--- a/templates/couchdb.ini
+++ b/templates/couchdb.ini
@@ -29,4 +29,4 @@ delayed_commits = false
 [admins]
 ${options['username']} = ${options['password']}
 {% if 'munin' in options %}munin = ${options['munin']}{% end %}
-{% end %}
\ No newline at end of file
+{% end %}