diff --git a/bootstrapvz/common/tasks/apt.py b/bootstrapvz/common/tasks/apt.py
index 3051f55..40faa53 100644
--- a/bootstrapvz/common/tasks/apt.py
+++ b/bootstrapvz/common/tasks/apt.py
@@ -26,10 +26,10 @@ class AddDefaultSources(Task):
 		sections = 'main'
 		if 'sections' in info.manifest.system:
 			sections = ' '.join(info.manifest.system['sections'])
-		info.source_lists.add('main', 'deb     {apt_mirror} {system.release} '+sections)
-		info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} '+sections)
-		info.source_lists.add('main', 'deb     http://security.debian.org/  {system.release}/updates '+sections)
-		info.source_lists.add('main', 'deb-src http://security.debian.org/  {system.release}/updates '+sections)
+		info.source_lists.add('main', 'deb     {apt_mirror} {system.release} ' + sections)
+		info.source_lists.add('main', 'deb-src {apt_mirror} {system.release} ' + sections)
+		info.source_lists.add('main', 'deb     http://security.debian.org/  {system.release}/updates ' + sections)
+		info.source_lists.add('main', 'deb-src http://security.debian.org/  {system.release}/updates ' + sections)
 		if info.manifest.system['release'] not in {'testing', 'unstable'}:
 			info.source_lists.add('main', 'deb     {apt_mirror} {system.release}-updates ' + sections)
 			info.source_lists.add('main', 'deb-src {apt_mirror} {system.release}-updates ' + sections)
diff --git a/bootstrapvz/plugins/cloud_init/__init__.py b/bootstrapvz/plugins/cloud_init/__init__.py
index 3dd8682..a207e2f 100644
--- a/bootstrapvz/plugins/cloud_init/__init__.py
+++ b/bootstrapvz/plugins/cloud_init/__init__.py
@@ -14,8 +14,8 @@ def resolve_tasks(taskset, manifest):
 	if manifest.system['release'] in ['wheezy', 'stable']:
 		taskset.add(tasks.AddBackports)
 
-	taskset.update([ tasks.SetMetadataSource,
-			tasks.AddCloudInitPackages,
+	taskset.update([tasks.SetMetadataSource,
+	                tasks.AddCloudInitPackages,
 	                ])
 
 	options = manifest.plugins['cloud_init']
diff --git a/bootstrapvz/plugins/opennebula/__init__.py b/bootstrapvz/plugins/opennebula/__init__.py
index 4164c31..4ac6056 100644
--- a/bootstrapvz/plugins/opennebula/__init__.py
+++ b/bootstrapvz/plugins/opennebula/__init__.py
@@ -5,4 +5,3 @@ def resolve_tasks(taskset, manifest):
 	if manifest.system['release'] in ['wheezy', 'stable']:
 		taskset.add(tasks.AddBackports)
 	taskset.update([tasks.AddONEContextPackage])
-
diff --git a/bootstrapvz/plugins/opennebula/tasks.py b/bootstrapvz/plugins/opennebula/tasks.py
index 202c5a2..ece7354 100644
--- a/bootstrapvz/plugins/opennebula/tasks.py
+++ b/bootstrapvz/plugins/opennebula/tasks.py
@@ -18,6 +18,7 @@ class AddBackports(Task):
 			info.source_lists.add('backports', 'deb     {apt_mirror} {system.release}-backports main')
 			info.source_lists.add('backports', 'deb-src {apt_mirror} {system.release}-backports main')
 
+
 class AddONEContextPackage(Task):
 	description = 'Adding the OpenNebula context package'
 	phase = phases.preparation
diff --git a/bootstrapvz/providers/azure/__init__.py b/bootstrapvz/providers/azure/__init__.py
index 48d17d5..bf799fb 100644
--- a/bootstrapvz/providers/azure/__init__.py
+++ b/bootstrapvz/providers/azure/__init__.py
@@ -51,8 +51,7 @@ def resolve_tasks(tasklist, manifest):
 	                 tasks.boot.ConfigureGrub,
 	                 cleanup.ClearMOTD,
 	                 cleanup.CleanTMP,
-
-			 tasks.image.ConvertToVhd
+	                 tasks.image.ConvertToVhd,
 	                 ])
 
 	if manifest.bootstrapper.get('tarball', False):
diff --git a/bootstrapvz/providers/azure/tasks/packages.py b/bootstrapvz/providers/azure/tasks/packages.py
index 6581374..efcb67f 100644
--- a/bootstrapvz/providers/azure/tasks/packages.py
+++ b/bootstrapvz/providers/azure/tasks/packages.py
@@ -20,6 +20,7 @@ class DefaultPackages(Task):
 		info.packages.add('python-pyasn1')
 		info.packages.add('sudo')
 
+
 class Waagent(Task):
 	description = 'Add waagent'
 	phase = phases.package_installation
@@ -43,4 +44,4 @@ class Waagent(Task):
 		if info.manifest.system['waagent'].get('conf', False):
 			if os.path.isfile(info.manifest.system['waagent']['conf']):
 				log_check_call(['cp', info.manifest.system['waagent']['conf'],
-				                      os.path.join(info.root,'etc/waagent.conf')])
+				                os.path.join(info.root, 'etc/waagent.conf')])
diff --git a/docs/conf.py b/docs/conf.py
index 62b62f4..e9a3f19 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -186,7 +186,7 @@ htmlhelp_basename = 'bootstrap-vzdoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
+latex_elements = {}
 # The paper size ('letterpaper' or 'a4paper').
 #'papersize': 'letterpaper',
 
@@ -195,15 +195,13 @@ latex_elements = {
 
 # Additional stuff for the LaTeX preamble.
 #'preamble': '',
-}
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  ('index', 'bootstrap-vz.tex', u'bootstrap-vz Documentation',
-   u'Anders Ingemann', 'manual'),
-]
+latex_documents = [('index', 'bootstrap-vz.tex', u'bootstrap-vz Documentation',
+                   u'Anders Ingemann', 'manual'),
+                   ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
@@ -244,11 +242,10 @@ man_pages = [
 # Grouping the document tree into Texinfo files. List of tuples
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'bootstrap-vz', u'bootstrap-vz Documentation',
-   u'Anders Ingemann', 'bootstrap-vz', 'One line description of project.',
-   'Miscellaneous'),
-]
+texinfo_documents = [('index', 'bootstrap-vz', u'bootstrap-vz Documentation',
+                     u'Anders Ingemann', 'bootstrap-vz', 'One line description of project.',
+                     'Miscellaneous'),
+                     ]
 
 # Documents to append as an appendix to all manuals.
 #texinfo_appendices = []