diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py
index 3a679fa7e..b2c843251 100644
--- a/letsencrypt-apache/letsencrypt_apache/configurator.py
+++ b/letsencrypt-apache/letsencrypt_apache/configurator.py
@@ -345,7 +345,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
     def included_in_wildcard(self, names, target_name):
         """Helper function to see if alias is covered by wildcard"""
         target_name = target_name.split(".")[::-1]
-        wildcards = [domain.split(".")[1:] for domain in names if domain.startswith("*")]
+        wildcards = [domain.split(".")[1:] for domain in
+                     names if domain.startswith("*")]
         for wildcard in wildcards:
             if len(wildcard) > len(target_name):
                 continue
@@ -545,7 +546,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             paths = self.aug.match(
                 ("/files%s//*[label()=~regexp('%s')]" %
                     (vhost_path, parser.case_i("VirtualHost"))))
-            paths = [path for path in paths if os.path.basename(path) == "VirtualHost"]
+            paths = [path for path in paths if
+                     os.path.basename(path) == "VirtualHost"]
             for path in paths:
                 new_vhost = self._create_vhost(path)
                 realpath = os.path.realpath(new_vhost.filep)
@@ -890,10 +892,13 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         if not vh_p:
             return
         vh_path = vh_p[0]
-        if (self.parser.find_dir("ServerName", target_name, start=vh_path, exclude=False)
-           or self.parser.find_dir("ServerAlias", target_name, start=vh_path, exclude=False)):
+        if (self.parser.find_dir("ServerName", target_name,
+                                 start=vh_path, exclude=False) or
+            self.parser.find_dir("ServerAlias", target_name,
+                                 start=vh_path, exclude=False)):
             return
-        if not self.parser.find_dir("ServerName", None, start=vh_path, exclude=False):
+        if not self.parser.find_dir("ServerName", None,
+                                    start=vh_path, exclude=False):
             self.parser.add_dir(vh_path, "ServerName", target_name)
         else:
             self.parser.add_dir(vh_path, "ServerAlias", target_name)
diff --git a/letsencrypt-apache/letsencrypt_apache/constants.py b/letsencrypt-apache/letsencrypt_apache/constants.py
index 77f71a461..7537cae42 100644
--- a/letsencrypt-apache/letsencrypt_apache/constants.py
+++ b/letsencrypt-apache/letsencrypt_apache/constants.py
@@ -18,7 +18,7 @@ CLI_DEFAULTS_DEBIAN = dict(
     handle_sites=True,
     challenge_location="/etc/apache2",
     MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
-    "letsencrypt_apache", "options-ssl-apache.conf")
+        "letsencrypt_apache", "options-ssl-apache.conf")
 )
 CLI_DEFAULTS_CENTOS = dict(
     server_root="/etc/httpd",
@@ -35,7 +35,7 @@ CLI_DEFAULTS_CENTOS = dict(
     handle_sites=False,
     challenge_location="/etc/httpd/conf.d",
     MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
-    "letsencrypt_apache", "centos-options-ssl-apache.conf")
+        "letsencrypt_apache", "centos-options-ssl-apache.conf")
 )
 CLI_DEFAULTS_GENTOO = dict(
     server_root="/etc/apache2",
@@ -52,7 +52,7 @@ CLI_DEFAULTS_GENTOO = dict(
     handle_sites=False,
     challenge_location="/etc/apache2/vhosts.d",
     MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
-    "letsencrypt_apache", "options-ssl-apache.conf")
+        "letsencrypt_apache", "options-ssl-apache.conf")
 )
 CLI_DEFAULTS_DARWIN = dict(
     server_root="/etc/apache2",
@@ -69,7 +69,7 @@ CLI_DEFAULTS_DARWIN = dict(
     handle_sites=False,
     challenge_location="/etc/apache2/other",
     MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
-    "letsencrypt_apache", "options-ssl-apache.conf")
+        "letsencrypt_apache", "options-ssl-apache.conf")
 )
 CLI_DEFAULTS = {
     "debian": CLI_DEFAULTS_DEBIAN,
diff --git a/letsencrypt-apache/letsencrypt_apache/obj.py b/letsencrypt-apache/letsencrypt_apache/obj.py
index 80a49b6a6..c05ee4bcc 100644
--- a/letsencrypt-apache/letsencrypt_apache/obj.py
+++ b/letsencrypt-apache/letsencrypt_apache/obj.py
@@ -208,7 +208,8 @@ class VirtualHost(object):  # pylint: disable=too-few-public-methods
             # If equal and set is not empty... assume same server
             if self.name is not None or self.aliases:
                 return True
-        # If we're looking for a generic vhost, don't return one with a ServerName
+        # If we're looking for a generic vhost,
+        # don't return one with a ServerName
         elif self.name:
             return False
 
diff --git a/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py b/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
index 3af61a7e7..9316427e5 100644
--- a/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
+++ b/letsencrypt-apache/letsencrypt_apache/tls_sni_01.py
@@ -145,7 +145,7 @@ class ApacheTlsSni01(common.TLSSNI01):
                 parser.case_i("Include"), self.challenge_conf)) == 0:
             # print "Including challenge virtual host(s)"
             logger.debug("Adding Include %s to %s",
-                          self.challenge_conf, parser.get_aug_path(main_config))
+                         self.challenge_conf, parser.get_aug_path(main_config))
             self.configurator.parser.add_dir(
                 parser.get_aug_path(main_config),
                 "Include", self.challenge_conf)