diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 24f032ca1..477cb653f 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -555,7 +555,7 @@ class HelpfulArgumentParser(object):
 
         for i, token in enumerate(args):
             if token in VERBS:
-                reordered = args[:i] + args[i+1:] + [args[i]]
+                reordered = args[:i] + args[(i + 1):] + [args[i]]
                 self.verb = token
                 return reordered
 
diff --git a/letsencrypt/client.py b/letsencrypt/client.py
index bb04f4f5a..3e32ab015 100644
--- a/letsencrypt/client.py
+++ b/letsencrypt/client.py
@@ -311,7 +311,7 @@ class Client(object):
         return os.path.abspath(act_cert_path), cert_chain_abspath
 
     def deploy_certificate(self, domains, privkey_path,
-            cert_path, chain_path, fullchain_path):
+                           cert_path, chain_path, fullchain_path):
         """Install certificate
 
         :param list domains: list of domains to install the certificate
diff --git a/letsencrypt/plugins/null.py b/letsencrypt/plugins/null.py
index e87537684..cdb96a116 100644
--- a/letsencrypt/plugins/null.py
+++ b/letsencrypt/plugins/null.py
@@ -31,7 +31,7 @@ class Installer(common.Plugin):
         return []
 
     def deploy_cert(self, domain, cert_path, key_path,
-            chain_path=None, fullchain_path=None):
+                    chain_path=None, fullchain_path=None):
         pass  # pragma: no cover
 
     def enhance(self, domain, enhancement, options=None):
diff --git a/letsencrypt/tests/client_test.py b/letsencrypt/tests/client_test.py
index 9a5a2bbe1..3f7b84a64 100644
--- a/letsencrypt/tests/client_test.py
+++ b/letsencrypt/tests/client_test.py
@@ -151,8 +151,8 @@ class ClientTest(unittest.TestCase):
         installer = mock.MagicMock()
         self.client.installer = installer
 
-        self.client.deploy_certificate(["foo.bar"], "key", "cert", "chain",
-            "fullchain")
+        self.client.deploy_certificate(
+            ["foo.bar"], "key", "cert", "chain", "fullchain")
         installer.deploy_cert.assert_called_once_with(
             cert_path=os.path.abspath("cert"),
             chain_path=os.path.abspath("chain"),