diff --git a/bootstrapvz/base/fs/__init__.py b/bootstrapvz/base/fs/__init__.py
index a683504..931ae8a 100644
--- a/bootstrapvz/base/fs/__init__.py
+++ b/bootstrapvz/base/fs/__init__.py
@@ -31,5 +31,5 @@ def load_volume(data, bootloader):
 	                   'vmdk': VirtualMachineDisk,
 	                   'ebs': EBSVolume
 	                   }
-	 # Create the volume with the partition map as an argument
+	# Create the volume with the partition map as an argument
 	return volume_backings.get(data['backing'])(partition_map)
diff --git a/bootstrapvz/common/__init__.py b/bootstrapvz/common/__init__.py
index f4fa88c..e69de29 100644
--- a/bootstrapvz/common/__init__.py
+++ b/bootstrapvz/common/__init__.py
@@ -1 +0,0 @@
-from exceptions import *
diff --git a/bootstrapvz/common/tasks/filesystem.py b/bootstrapvz/common/tasks/filesystem.py
index 77f277c..8c4ab8a 100644
--- a/bootstrapvz/common/tasks/filesystem.py
+++ b/bootstrapvz/common/tasks/filesystem.py
@@ -144,10 +144,10 @@ class FStab(Task):
 		import os.path
 		p_map = info.volume.partition_map
 		mount_points = [{'path': '/',
-			               'partition': p_map.root,
-			               'dump': '1',
-			               'pass_num': '1',
-			                }]
+		                 'partition': p_map.root,
+		                 'dump': '1',
+		                 'pass_num': '1',
+		                 }]
 		if hasattr(p_map, 'boot'):
 			mount_points.append({'path': '/boot',
 			                     'partition': p_map.boot,
diff --git a/bootstrapvz/plugins/cloud_init/tasks.py b/bootstrapvz/plugins/cloud_init/tasks.py
index dde46d6..90b3fde 100644
--- a/bootstrapvz/plugins/cloud_init/tasks.py
+++ b/bootstrapvz/plugins/cloud_init/tasks.py
@@ -52,9 +52,8 @@ class SetUsername(Task):
 
 class SetMetadataSource(Task):
 	description = 'Setting metadata source'
-	#phase = phases.system_modification
 	phase = phases.package_installation
-        successors = [apt.AptUpdate]
+	successors = [apt.AptUpdate]
 
 	@classmethod
 	def run(cls, info):
diff --git a/bootstrapvz/plugins/opennebula/tasks.py b/bootstrapvz/plugins/opennebula/tasks.py
index ece7354..410bc90 100644
--- a/bootstrapvz/plugins/opennebula/tasks.py
+++ b/bootstrapvz/plugins/opennebula/tasks.py
@@ -1,7 +1,6 @@
 from bootstrapvz.base import Task
 from bootstrapvz.common.tasks import apt
 from bootstrapvz.common import phases
-import os
 
 
 class AddBackports(Task):
diff --git a/bootstrapvz/plugins/puppet/tasks.py b/bootstrapvz/plugins/puppet/tasks.py
index dca4cd7..2627e69 100644
--- a/bootstrapvz/plugins/puppet/tasks.py
+++ b/bootstrapvz/plugins/puppet/tasks.py
@@ -2,6 +2,7 @@ from bootstrapvz.base import Task
 from bootstrapvz.common import phases
 from bootstrapvz.common.tasks import apt
 from bootstrapvz.common.tasks import network
+from bootstrapvz.common.tools import sed_i
 import os
 
 
@@ -82,7 +83,6 @@ class ApplyPuppetManifest(Task):
 		                'puppet', 'apply', manifest_path])
 		os.remove(manifest_dst)
 
-		from bootstrapvz.common.tools import sed_i
 		hosts_path = os.path.join(info.root, 'etc/hosts')
 		sed_i(hosts_path, '127.0.0.1\s*{hostname}\n?'.format(hostname=hostname), '')
 
diff --git a/bootstrapvz/plugins/vagrant/__init__.py b/bootstrapvz/plugins/vagrant/__init__.py
index f3d53ba..c84de64 100644
--- a/bootstrapvz/plugins/vagrant/__init__.py
+++ b/bootstrapvz/plugins/vagrant/__init__.py
@@ -10,7 +10,6 @@ def validate_manifest(data, validator, error):
 def resolve_tasks(taskset, manifest):
 	from bootstrapvz.common.tasks import security
 	from bootstrapvz.common.tasks import loopback
-	from bootstrapvz.common.tasks import network
 	taskset.discard(security.DisableSSHPasswordAuthentication)
 	taskset.discard(loopback.MoveImage)
 
diff --git a/bootstrapvz/providers/azure/__init__.py b/bootstrapvz/providers/azure/__init__.py
index 79d868d..ff9fedf 100644
--- a/bootstrapvz/providers/azure/__init__.py
+++ b/bootstrapvz/providers/azure/__init__.py
@@ -45,18 +45,18 @@ def resolve_tasks(taskset, manifest):
 		taskset.add(network.RemoveHostname)
 
 	taskset.update([tasks.packages.DefaultPackages,
-	                 loopback.Create,
-	                 security.EnableShadowConfig,
-	                 network.RemoveDNSInfo,
-	                 network.ConfigureNetworkIF,
-	                 initd.AddSSHKeyGeneration,
-	                 initd.InstallInitScripts,
-	                 tasks.packages.Waagent,
-	                 tasks.boot.ConfigureGrub,
-	                 cleanup.ClearMOTD,
-	                 cleanup.CleanTMP,
-	                 tasks.image.ConvertToVhd,
-	                 ])
+	                loopback.Create,
+	                security.EnableShadowConfig,
+	                network.RemoveDNSInfo,
+	                network.ConfigureNetworkIF,
+	                initd.AddSSHKeyGeneration,
+	                initd.InstallInitScripts,
+	                tasks.packages.Waagent,
+	                tasks.boot.ConfigureGrub,
+	                cleanup.ClearMOTD,
+	                cleanup.CleanTMP,
+	                tasks.image.ConvertToVhd,
+	                ])
 
 	if manifest.bootstrapper.get('tarball', False):
 		taskset.add(bootstrap.MakeTarball)
diff --git a/bootstrapvz/providers/azure/tasks/image.py b/bootstrapvz/providers/azure/tasks/image.py
index 548e8e3..e5bbf23 100644
--- a/bootstrapvz/providers/azure/tasks/image.py
+++ b/bootstrapvz/providers/azure/tasks/image.py
@@ -1,6 +1,5 @@
 from bootstrapvz.base import Task
 from bootstrapvz.common import phases
-from bootstrapvz.common.tasks import loopback
 
 
 class ConvertToVhd(Task):
diff --git a/bootstrapvz/providers/kvm/__init__.py b/bootstrapvz/providers/kvm/__init__.py
index b004907..f712a87 100644
--- a/bootstrapvz/providers/kvm/__init__.py
+++ b/bootstrapvz/providers/kvm/__init__.py
@@ -43,19 +43,16 @@ def resolve_tasks(taskset, manifest):
 		taskset.add(network.RemoveHostname)
 
 	taskset.update([tasks.packages.DefaultPackages,
-
-	                 loopback.Create,
-
-	                 security.EnableShadowConfig,
-	                 network.RemoveDNSInfo,
-	                 network.ConfigureNetworkIF,
-	                 initd.AddSSHKeyGeneration,
-	                 initd.InstallInitScripts,
-	                 cleanup.ClearMOTD,
-	                 cleanup.CleanTMP,
-
-	                 loopback.MoveImage,
-	                 ])
+	                loopback.Create,
+	                security.EnableShadowConfig,
+	                network.RemoveDNSInfo,
+	                network.ConfigureNetworkIF,
+	                initd.AddSSHKeyGeneration,
+	                initd.InstallInitScripts,
+	                cleanup.ClearMOTD,
+	                cleanup.CleanTMP,
+	                loopback.MoveImage,
+	                ])
 
 	if manifest.bootstrapper.get('tarball', False):
 		taskset.add(bootstrap.MakeTarball)