diff --git a/pyrebase/pyrebase.py b/pyrebase/pyrebase.py
index bc1fc3e..6bcac21 100644
--- a/pyrebase/pyrebase.py
+++ b/pyrebase/pyrebase.py
@@ -4,7 +4,7 @@
 
 try:
     from urllib.parse import urlencode, quote
-except:
+except ImportError:
     from urllib import urlencode, quote
 import json
 import math
@@ -324,8 +324,7 @@ def stream(self, stream_handler, token=None, stream_id=None):
     def check_token(self, database_url, path, token):
         if token:
             return '{0}{1}.json?auth={2}'.format(database_url, path, token)
-        else:
-            return '{0}{1}.json'.format(database_url, path)
+        return '{0}{1}.json'.format(database_url, path)
 
     def generate_key(self):
         push_chars = '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'
@@ -399,8 +398,7 @@ def put(self, file, token=None):
             blob = self.bucket.blob(path)
             if isinstance(file, str):
                 return blob.upload_from_filename(filename=file)
-            else:
-                return blob.upload_from_file(file_obj=file)
+            return blob.upload_from_file(file_obj=file)
         else:
             request_object = self.requests.post(request_ref, data=file_object)
             raise_detailed_error(request_object)
diff --git a/sseclient/sseclient.py b/sseclient/sseclient.py
index dac48a4..86d5eed 100644
--- a/sseclient/sseclient.py
+++ b/sseclient/sseclient.py
@@ -1,16 +1,14 @@
 import re
 import time
 import warnings
-import threading
-import six
-
 import requests
-
+import six
 
 # Technically, we should support streams that mix line endings.  This regex,
 # however, assumes that a system will provide consistent line endings.
 end_of_field = re.compile(r'\r\n\r\n|\r\r|\n\n')
 
+
 class SSEClient(object):
     def __init__(self, url, session, build_headers, last_id=None, retry=3000, **kwargs):
         self.url = url