diff --git a/certbot/cli.py b/certbot/cli.py
index 796925c1d..430384a5a 100644
--- a/certbot/cli.py
+++ b/certbot/cli.py
@@ -349,7 +349,7 @@ class HelpfulArgumentParser(object):
 
 
     def set_test_server(self, parsed_args):
-        "We have --staging/--dry-run; perform sanity check and set config.server"
+        """We have --staging/--dry-run; perform sanity check and set config.server"""
 
         if parsed_args.server not in (flag_default("server"), constants.STAGING_URI):
             conflicts = ["--staging"] if parsed_args.staging else []
diff --git a/certbot/crypto_util.py b/certbot/crypto_util.py
index ceec6db71..07e7f9fd2 100644
--- a/certbot/crypto_util.py
+++ b/certbot/crypto_util.py
@@ -178,11 +178,11 @@ def import_csr_file(csrfile, contents):
     :param str csrfile: CSR filename
     :param str contents: contens of the CSR file
 
-    :rtype: tuple
-
     :returns: (le_util.CSR object representing the CSR,
-               OpenSSL FILETYPE_ representing DER or PEM,
+               `OpenSSL.crypto.FILETYPE_PEM` or `OpenSSL.crypto.FILETYPE_ASN1`,
                list of domains requested in the CSR)
+
+    :rtype: tuple
     """
     try:
         csr = le_util.CSR(file=csrfile, data=contents, form="der")