diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 73dd24bdb..0bd5f537e 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -729,11 +729,13 @@ def create_parser(plugins, args):
 
     return helpful.parser, helpful.args
 
+
 # For now unfortunately this constant just needs to match the code below;
 # there isn't an elegant way to autogenerate it in time.
 VERBS = ["run", "auth", "install", "revoke", "rollback", "config_changes", "plugins"]
 HELP_TOPICS = ["all", "security", "paths", "automation", "testing"] + VERBS
 
+
 def _create_subparsers(helpful):
     subparsers = helpful.parser.add_subparsers(metavar="SUBCOMMAND")
 
@@ -741,7 +743,7 @@ def _create_subparsers(helpful):
         if name == "plugins":
             func = plugins_cmd
         else:
-            func = eval(name) # pylint: disable=eval-used
+            func = eval(name)  # pylint: disable=eval-used
         h = func.__doc__.splitlines()[0]
         subparser = subparsers.add_parser(name, help=h, description=func.__doc__)
         subparser.set_defaults(func=func)
@@ -762,22 +764,23 @@ def _create_subparsers(helpful):
     helpful.add_group("plugins", description="Plugin options")
 
     helpful.add("auth",
-        "--csr", type=read_file, help="Path to a Certificate Signing Request (CSR) in DER format.")
+                "--csr", type=read_file,
+                help="Path to a Certificate Signing Request (CSR) in DER format.")
     helpful.add("rollback",
-        "--checkpoints", type=int, metavar="N",
-        default=flag_default("rollback_checkpoints"),
-        help="Revert configuration N number of checkpoints.")
+                "--checkpoints", type=int, metavar="N",
+                default=flag_default("rollback_checkpoints"),
+                help="Revert configuration N number of checkpoints.")
 
     helpful.add("plugins",
-        "--init", action="store_true", help="Initialize plugins.")
+                "--init", action="store_true", help="Initialize plugins.")
     helpful.add("plugins",
-        "--prepare", action="store_true", help="Initialize and prepare plugins.")
+                "--prepare", action="store_true", help="Initialize and prepare plugins.")
     helpful.add("plugins",
-        "--authenticators", action="append_const", dest="ifaces",
-        const=interfaces.IAuthenticator, help="Limit to authenticator plugins only.")
+                "--authenticators", action="append_const", dest="ifaces",
+                const=interfaces.IAuthenticator, help="Limit to authenticator plugins only.")
     helpful.add("plugins",
-        "--installers", action="append_const", dest="ifaces",
-        const=interfaces.IInstaller, help="Limit to installer plugins only.")
+                "--installers", action="append_const", dest="ifaces",
+                const=interfaces.IInstaller, help="Limit to installer plugins only.")
 
 
 def _paths_parser(helpful):
diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py
index 0a92aba62..d0fae370d 100644
--- a/letsencrypt/tests/cli_test.py
+++ b/letsencrypt/tests/cli_test.py
@@ -57,7 +57,6 @@ class CLITest(unittest.TestCase):
                 ret = cli.main(args)
         return ret, None, stderr, client
 
-
     def test_no_flags(self):
         with mock.patch('letsencrypt.cli.run') as mock_run:
             self._call([])
@@ -91,7 +90,6 @@ class CLITest(unittest.TestCase):
             from letsencrypt import cli
             self.assertTrue(cli.USAGE in out)
 
-
     def test_rollback(self):
         _, _, _, client = self._call(['rollback'])
         self.assertEqual(1, client.rollback.call_count)