diff --git a/pywb/apps/live_rewrite_server.py b/pywb/apps/live_rewrite_server.py
index 8d3544f3..8de26f10 100644
--- a/pywb/apps/live_rewrite_server.py
+++ b/pywb/apps/live_rewrite_server.py
@@ -18,7 +18,7 @@ def create_app():
 
     result, unknown = parser.parse_known_args()
 
-    config=dict(proxyhostport=result.proxy, framed_replay=True)
+    config = dict(proxyhostport=result.proxy, framed_replay=True)
 
     app = init_app(create_live_rewriter_app, load_yaml=False,
                    config=config)
diff --git a/pywb/framework/archivalrouter.py b/pywb/framework/archivalrouter.py
index 1b027488..749654ba 100644
--- a/pywb/framework/archivalrouter.py
+++ b/pywb/framework/archivalrouter.py
@@ -72,7 +72,6 @@ class ArchivalRouter(object):
 
         return wbrequest
 
-
     def render_home_page(self, env):
         # render the homepage!
         if self.home_view:
diff --git a/pywb/framework/proxy.py b/pywb/framework/proxy.py
index 21bb65b5..bdf5753f 100644
--- a/pywb/framework/proxy.py
+++ b/pywb/framework/proxy.py
@@ -56,7 +56,8 @@ class ProxyRouter(object):
         self.auth_msg = routing_options.get('auth_msg',
         'Please enter name of a collection to use for proxy mode')
 
-        self.proxy_coll_select = routing_options.get('proxy_coll_select', False)
+        self.proxy_coll_select = routing_options.get('proxy_coll_select',
+                                                     False)
 
     def __call__(self, env):
         url = env['REL_REQUEST_URI']
diff --git a/pywb/rewrite/rewrite_content.py b/pywb/rewrite/rewrite_content.py
index 01de8d2d..ec93593a 100644
--- a/pywb/rewrite/rewrite_content.py
+++ b/pywb/rewrite/rewrite_content.py
@@ -160,7 +160,7 @@ class RewriteContent:
                                   first_buff=first_buff)
 
     @staticmethod
-    def _decode_buff(buff, stream, encoding): # pragma: no coverage
+    def _decode_buff(buff, stream, encoding):  # pragma: no coverage
         try:
             buff = buff.decode(encoding)
         except UnicodeDecodeError, e:
diff --git a/pywb/rewrite/url_rewriter.py b/pywb/rewrite/url_rewriter.py
index 70d5d2a8..d5593a22 100644
--- a/pywb/rewrite/url_rewriter.py
+++ b/pywb/rewrite/url_rewriter.py
@@ -81,8 +81,6 @@ class UrlRewriter(object):
         if new_url.startswith(self.prefix):
             new_url = new_url[len(self.prefix):]
 
-        #new_wburl = copy.copy(self.wburl)
-        #new_wburl.url = new_url
         new_wburl = WbUrl(new_url)
         return UrlRewriter(new_wburl, self.prefix)
 
@@ -122,7 +120,6 @@ class UrlRewriter(object):
 
         parts = (scheme, netloc, path, query, frag)
 
-
         new_url = urlparse.urlunsplit(parts)
         return new_url
 
diff --git a/pywb/warc/archiveiterator.py b/pywb/warc/archiveiterator.py
index 5d4c521b..6e9488e9 100644
--- a/pywb/warc/archiveiterator.py
+++ b/pywb/warc/archiveiterator.py
@@ -215,7 +215,8 @@ def create_record_iter(arcv_iter, options):
                  not append_post):
                 continue
 
-            elif (not include_all and record.content_type == 'application/warc-fields'):
+            elif (not include_all and
+                  record.content_type == 'application/warc-fields'):
                 continue
 
             entry = parse_warc_record(record)
@@ -226,7 +227,8 @@ def create_record_iter(arcv_iter, options):
             continue
 
         if entry.url and not entry.key:
-            entry.key = canonicalize(entry.url, options.get('surt_ordered', True))
+            entry.key = canonicalize(entry.url,
+                                     options.get('surt_ordered', True))
 
         compute_digest = False
 
diff --git a/pywb/warc/cdxindexer.py b/pywb/warc/cdxindexer.py
index dd7f08a7..585b5711 100644
--- a/pywb/warc/cdxindexer.py
+++ b/pywb/warc/cdxindexer.py
@@ -77,8 +77,10 @@ class SortedCDXWriter(CDXWriter):
         return False
 
 
+#=================================================================
 ALLOWED_EXT = ('.arc', '.arc.gz', '.warc', '.warc.gz')
 
+
 #=================================================================
 def iter_file_or_dir(inputs):
     for input_ in inputs:
diff --git a/pywb/webapp/replay_views.py b/pywb/webapp/replay_views.py
index 9cc0aa6a..ee88219d 100644
--- a/pywb/webapp/replay_views.py
+++ b/pywb/webapp/replay_views.py
@@ -72,7 +72,7 @@ class BaseContentView(object):
             embed_url = wbrequest.wb_url.to_str(mod=self._mp_mod)
             timestamp = datetime_to_timestamp(datetime.datetime.utcnow())
             url = wbrequest.wb_url.url
-            ctype='text/html'
+            ctype = 'text/html'
 
             return self.frame_insert_view.render_response(embed_url=embed_url,
                                                           wbrequest=wbrequest,