diff --git a/certbot/cli/cli_constants.py b/certbot/cli/cli_constants.py
index 9a2074b8d..0b60dea4a 100644
--- a/certbot/cli/cli_constants.py
+++ b/certbot/cli/cli_constants.py
@@ -1,3 +1,4 @@
+"""Certbot command line constants"""
 import sys
 import os
 
diff --git a/certbot/cli/cli_utils.py b/certbot/cli/cli_utils.py
index 2d9067dd0..61ef172e1 100644
--- a/certbot/cli/cli_utils.py
+++ b/certbot/cli/cli_utils.py
@@ -1,3 +1,4 @@
+"""Certbot command line util function"""
 import argparse
 import copy
 import os
diff --git a/certbot/cli/group_adder.py b/certbot/cli/group_adder.py
index 3972b89b4..9a1fc503e 100644
--- a/certbot/cli/group_adder.py
+++ b/certbot/cli/group_adder.py
@@ -1,3 +1,5 @@
+"""This module contains a function to add the groups of arguments for the help
+display"""
 from certbot.cli import VERB_HELP
 
 
diff --git a/certbot/cli/helpful.py b/certbot/cli/helpful.py
index caa8788d2..7249bee53 100644
--- a/certbot/cli/helpful.py
+++ b/certbot/cli/helpful.py
@@ -1,3 +1,4 @@
+"""Certbot command line argument parser"""
 from __future__ import print_function
 import argparse
 import copy
@@ -463,4 +464,4 @@ class HelpfulArgumentParser(object):
         elif not chosen_topic:
             return dict([(t, False) for t in self.help_topics])
         else:
-            return dict([(t, t == chosen_topic) for t in self.help_topics])
\ No newline at end of file
+            return dict([(t, t == chosen_topic) for t in self.help_topics])
diff --git a/certbot/cli/paths_parser.py b/certbot/cli/paths_parser.py
index 70e29aa9f..970411094 100644
--- a/certbot/cli/paths_parser.py
+++ b/certbot/cli/paths_parser.py
@@ -1,3 +1,5 @@
+"""This is a module that adds configuration to the argument parser regarding
+paths for certificates"""
 import os
 
 from certbot.cli import (
diff --git a/certbot/cli/plugins_parsing.py b/certbot/cli/plugins_parsing.py
index 2a5519c1a..404428e07 100644
--- a/certbot/cli/plugins_parsing.py
+++ b/certbot/cli/plugins_parsing.py
@@ -1,3 +1,4 @@
+"""This is a module that handles parsing of plugins for the argument parser"""
 from certbot.cli import flag_default
 
 
diff --git a/certbot/cli/report_config_interaction.py b/certbot/cli/report_config_interaction.py
index dff0d848b..c664b667b 100644
--- a/certbot/cli/report_config_interaction.py
+++ b/certbot/cli/report_config_interaction.py
@@ -1,3 +1,5 @@
+"""This is a module that reports config option interaction that should be
+checled by set_by_cli"""
 import six
 from certbot.cli import VAR_MODIFIERS
 
diff --git a/certbot/cli/subparsers.py b/certbot/cli/subparsers.py
index 70cbbb910..da2649ca9 100644
--- a/certbot/cli/subparsers.py
+++ b/certbot/cli/subparsers.py
@@ -1,3 +1,4 @@
+"""This module creates subparsers for the argument parser"""
 from certbot import constants
 from certbot import interfaces
 
@@ -71,4 +72,4 @@ def _create_subparsers(helpful):
     helpful.add("plugins",
                 "--installers", action="append_const", dest="ifaces",
                 default=flag_default("ifaces"),
-                const=interfaces.IInstaller, help="Limit to installer plugins only.")
\ No newline at end of file
+                const=interfaces.IInstaller, help="Limit to installer plugins only.")
diff --git a/certbot/cli/verb_help.py b/certbot/cli/verb_help.py
index f34341318..cc07bb541 100644
--- a/certbot/cli/verb_help.py
+++ b/certbot/cli/verb_help.py
@@ -1,3 +1,4 @@
+"""This module contain help information for verbs supported by certbot"""
 import os
 
 from certbot.cli import (
diff --git a/certbot/cli/warning.py b/certbot/cli/warning.py
index b2ba10e4f..40d630cd4 100644
--- a/certbot/cli/warning.py
+++ b/certbot/cli/warning.py
@@ -1,3 +1,4 @@
+"""This module warns for usage of deprecated letsencrypt-auto"""
 import os
 import sys
 import logging