diff --git a/base/fs/partitionmaps/abstract.py b/base/fs/partitionmaps/abstract.py
index bac76c4..5614c75 100644
--- a/base/fs/partitionmaps/abstract.py
+++ b/base/fs/partitionmaps/abstract.py
@@ -50,12 +50,12 @@ class AbstractPartitionMap(FSMProxy):
 				if match is None:
 					raise PartitionError('Unable to parse kpartx output: {line}'.format(line=mapping))
 				partition_path = os.path.join('/dev/mapper', match.group('name'))
-				p_idx = int(match.group('p_idx'))-1
+				p_idx = int(match.group('p_idx')) - 1
 				self.partitions[p_idx].map(partition_path)
 
 			for idx, partition in enumerate(self.partitions):
 				if partition.fsm.current not in ['mapped', 'formatted']:
-					raise PartitionError('kpartx did not map partition #{idx}'.format(idx=idx+1))
+					raise PartitionError('kpartx did not map partition #{idx}'.format(idx=idx + 1))
 
 		except PartitionError as e:
 			for partition in self.partitions:
diff --git a/base/fs/partitions/base.py b/base/fs/partitions/base.py
index 3f5792f..04fbb07 100644
--- a/base/fs/partitions/base.py
+++ b/base/fs/partitions/base.py
@@ -25,7 +25,7 @@ class BasePartition(AbstractPartition):
 		if self.previous is None:
 			return 1
 		else:
-			return self.previous.get_index()+1
+			return self.previous.get_index() + 1
 
 	def get_start(self):
 		if self.previous is None:
diff --git a/common/fs/loopbackvolume.py b/common/fs/loopbackvolume.py
index 322cf0d..d7a6b6b 100644
--- a/common/fs/loopbackvolume.py
+++ b/common/fs/loopbackvolume.py
@@ -35,7 +35,7 @@ class LoopbackVolume(Volume):
 		loop_device_name = os.path.basename(self.loop_device_path)
 		loop_device_partition = proc_partitions[loop_device_name]
 
-		sectors = self.size*1024*1024/512
+		sectors = self.size * 1024 * 1024 / 512
 		table = ('{log_start_sec} {sectors} linear {major}:{minor} {start_sec}'
 		         .format(log_start_sec=0,
 		                 sectors=sectors,
diff --git a/common/tasks/boot.py b/common/tasks/boot.py
index 63d50f1..bf4c409 100644
--- a/common/tasks/boot.py
+++ b/common/tasks/boot.py
@@ -75,7 +75,7 @@ class InstallGrub(Task):
 						device_map.write('(hd0,{prefix}{idx}) {device_path}\n'
 						                 .format(device_path=partition.device_path,
 						                         prefix=partition_prefix,
-						                         idx=idx+1))
+						                         idx=idx + 1))
 
 			# Install grub
 			log_check_call(['/usr/sbin/chroot', info.root,
diff --git a/providers/ec2/tasks/ami.py b/providers/ec2/tasks/ami.py
index 3b5cbd0..de7d22d 100644
--- a/providers/ec2/tasks/ami.py
+++ b/providers/ec2/tasks/ami.py
@@ -95,60 +95,61 @@ class RegisterAMI(Task):
 	predecessors = [Snapshot, UploadImage]
 
 	# Source: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedKernels.html#AmazonKernelImageIDs
-	kernel_mapping = {'ap-northeast-1': {  # Asia Pacific (Tokyo) Region
-	                  'hd0':  {'i386':  'aki-136bf512',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-176bf516'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-196bf518',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-1f6bf51e'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  },
-	                  'ap-southeast-1': {  # Asia Pacific (Singapore) Region
-	                  'hd0':  {'i386':  'aki-ae3973fc',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-503e7402'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-563e7404',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-5e3e740c'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  },
-	                  'ap-southeast-2': {  # Asia Pacific (Sydney) Region
-	                  'hd0':  {'i386':  'aki-cd62fff7',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-c362fff9'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-c162fffb',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-3b1d8001'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  },
-	                  'eu-west-1': {  # EU (Ireland) Region
-	                  'hd0':  {'i386':  'aki-68a3451f',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-52a34525'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-5ea34529',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-58a3452f'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  },
-	                  'sa-east-1': {  # South America (Sao Paulo) Region
-	                  'hd0':  {'i386':  'aki-5b53f446',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-5553f448'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-5753f44a',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-5153f44c'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  },
-	                  'us-east-1': {  # US East (Northern Virginia) Region
-	                  'hd0':  {'i386':  'aki-8f9dcae6',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-919dcaf8'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-659ccb0c',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-499ccb20'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  },
-	                  'us-gov-west-1': {  # AWS GovCloud (US)
-	                  'hd0':  {'i386':  'aki-1fe98d3c',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-1de98d3e'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-63e98d40',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-61e98d42'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  },
-	                  'us-west-1': {  # US West (Northern California) Region
-	                  'hd0':  {'i386':  'aki-8e0531cb',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-880531cd'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-960531d3',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-920531d7'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  },
-	                  'us-west-2': {  # US West (Oregon) Region
-	                  'hd0':  {'i386':  'aki-f08f11c0',   # pv-grub-hd0_1.04-i386.gz
-	                           'amd64': 'aki-fc8f11cc'},  # pv-grub-hd0_1.04-x86_64.gz
-	                  'hd00': {'i386':  'aki-e28f11d2',   # pv-grub-hd00_1.04-i386.gz
-	                           'amd64': 'aki-e68f11d6'}   # pv-grub-hd00_1.04-x86_64.gz
-	                  }}
+	kernel_mapping = {'ap-northeast-1':  # Asia Pacific (Tokyo) Region
+	                  {'hd0':  {'i386':  'aki-136bf512',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-176bf516'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-196bf518',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-1f6bf51e'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   },
+	                  'ap-southeast-1':  # Asia Pacific (Singapore) Region
+	                  {'hd0':  {'i386':  'aki-ae3973fc',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-503e7402'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-563e7404',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-5e3e740c'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   },
+	                  'ap-southeast-2':  # Asia Pacific (Sydney) Region
+	                  {'hd0':  {'i386':  'aki-cd62fff7',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-c362fff9'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-c162fffb',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-3b1d8001'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   },
+	                  'eu-west-1':  # EU (Ireland) Region
+	                  {'hd0':  {'i386':  'aki-68a3451f',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-52a34525'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-5ea34529',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-58a3452f'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   },
+	                  'sa-east-1':  # South America (Sao Paulo) Region
+	                  {'hd0':  {'i386':  'aki-5b53f446',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-5553f448'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-5753f44a',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-5153f44c'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   },
+	                  'us-east-1':  # US East (Northern Virginia) Region
+	                  {'hd0':  {'i386':  'aki-8f9dcae6',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-919dcaf8'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-659ccb0c',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-499ccb20'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   },
+	                  'us-gov-west-1':  # AWS GovCloud (US)
+	                  {'hd0':  {'i386':  'aki-1fe98d3c',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-1de98d3e'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-63e98d40',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-61e98d42'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   },
+	                  'us-west-1':  # US West (Northern California) Region
+	                  {'hd0':  {'i386':  'aki-8e0531cb',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-880531cd'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-960531d3',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-920531d7'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   },
+	                  'us-west-2':  # US West (Oregon) Region
+	                  {'hd0':  {'i386':  'aki-f08f11c0',   # pv-grub-hd0_1.04-i386.gz
+	                            'amd64': 'aki-fc8f11cc'},  # pv-grub-hd0_1.04-x86_64.gz
+	                   'hd00': {'i386':  'aki-e28f11d2',   # pv-grub-hd00_1.04-i386.gz
+	                            'amd64': 'aki-e68f11d6'}   # pv-grub-hd00_1.04-x86_64.gz
+	                   }
+	                  }
 
 	def run(self, info):
 		registration_params = {'name': info.ami_name,
@@ -169,7 +170,7 @@ class RegisterAMI(Task):
 			from boto.ec2.blockdevicemapping import BlockDeviceType
 			from boto.ec2.blockdevicemapping import BlockDeviceMapping
 			block_device = BlockDeviceType(snapshot_id=info.snapshot.id, delete_on_termination=True,
-			                               size=info.volume.partition_map.get_total_size()/1024)
+			                               size=info.volume.partition_map.get_total_size() / 1024)
 			registration_params['block_device_map'] = BlockDeviceMapping()
 			registration_params['block_device_map']['/dev/sda'] = block_device
 
diff --git a/providers/ec2/tasks/boot.py b/providers/ec2/tasks/boot.py
index 8c7f70a..2af221e 100644
--- a/providers/ec2/tasks/boot.py
+++ b/providers/ec2/tasks/boot.py
@@ -30,7 +30,7 @@ class ConfigurePVGrub(Task):
 			root_idx = info.volume.partition_map.root.get_index()
 			grub_device = 'GRUB_DEVICE=/dev/xvda{idx}'.format(idx=root_idx)
 			sed_i(script_dst, '^GRUB_DEVICE=/dev/xvda$', grub_device)
-			grub_root = '\troot (hd0,{idx})'.format(idx=root_idx-1)
+			grub_root = '\troot (hd0,{idx})'.format(idx=root_idx - 1)
 			sed_i(script_dst, '^\troot \(hd0\)$', grub_root)
 
 		if info.manifest.volume['backing'] == 's3':
diff --git a/providers/ec2/tasks/connection.py b/providers/ec2/tasks/connection.py
index 56e1b81..0d937bc 100644
--- a/providers/ec2/tasks/connection.py
+++ b/providers/ec2/tasks/connection.py
@@ -22,7 +22,7 @@ class GetCredentials(Task):
 			return creds
 
 		def env_key(key):
-			return ('aws-'+key).upper().replace('-', '_')
+			return ('aws-' + key).upper().replace('-', '_')
 		if all(getenv(env_key(key)) is not None for key in keys):
 			for key in keys:
 				creds[key] = getenv(env_key(key))