diff --git a/novaclient/shell.py b/novaclient/shell.py
index 20c4f7440..5e0eef40b 100644
--- a/novaclient/shell.py
+++ b/novaclient/shell.py
@@ -186,8 +186,9 @@ class OpenStackComputeShell(object):
                                        "via --url or via"
                                        "env[NOVA_URL")
 
-        self.cs = self.get_api_class(options.version)(user, password, projectid,
-                                     url, insecure, region_name=region_name,
+        self.cs = self.get_api_class(options.version)(user, password,
+                                     projectid, url, insecure,
+                                     region_name=region_name,
                                      endpoint_name=endpoint_name)
 
         try:
diff --git a/novaclient/v1_1/base.py b/novaclient/v1_1/base.py
index 67fc5dc57..ba5682768 100644
--- a/novaclient/v1_1/base.py
+++ b/novaclient/v1_1/base.py
@@ -113,8 +113,7 @@ class BootingManagerWithFind(base.ManagerWithFind):
                 # The mapping is in the format:
                 # <id>:[<type>]:[<size(GB)>]:[<delete_on_terminate>]
                 #
-                bdm_dict = {
-                    'device_name': device_name }
+                bdm_dict = {'device_name': device_name}
 
                 mapping_parts = mapping.split(':')
                 id = mapping_parts[0]
diff --git a/novaclient/v1_1/servers.py b/novaclient/v1_1/servers.py
index d555ae178..4869f4128 100644
--- a/novaclient/v1_1/servers.py
+++ b/novaclient/v1_1/servers.py
@@ -355,8 +355,8 @@ class ServerManager(local_base.BootingManagerWithFind):
         :param key_name: (optional extension) name of previously created
                       keypair to inject into the instance.
         :param availability_zone: The :class:`Zone`.
-        :param block_device_mapping: (optional extension) A dict of block device
-                      mappings for this server.
+        :param block_device_mapping: (optional extension) A dict of block
+                      device mappings for this server.
         :param nics:  (optional extension) an ordered list of nics to be
                       added to this server, with information about
                       connected networks, fixed ips, etc.
diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
index f13faae33..54e28ba1a 100644
--- a/novaclient/v1_1/shell.py
+++ b/novaclient/v1_1/shell.py
@@ -115,7 +115,7 @@ def _boot(cs, args, reservation_id=None, min_count=None, max_count=None):
     for nic_str in args.nics:
         nic_info = {"net-id": "", "v4-fixed-ip": ""}
         for kv_str in nic_str.split(","):
-            k,v = kv_str.split("=")
+            k, v = kv_str.split("=")
             nic_info[k] = v
         nics.append(nic_info)
 
@@ -905,6 +905,7 @@ def do_volume_detach(cs, args):
     cs.volumes.delete_server_volume(_find_server(cs, args.server).id,
                                         args.attachment_id)
 
+
 def do_volume_snapshot_list(cs, args):
     """List all the snapshots."""
     snapshots = cs.volume_snapshots.list()