diff --git a/setup.py b/setup.py
index 893af75..14730c8 100644
--- a/setup.py
+++ b/setup.py
@@ -18,9 +18,9 @@
 
 with open('pip-requirements.txt') as reqs:
     install_requires = [
-        line for line in reqs.read().split('\n') if (line and not
-                                                     line.startswith('--')) and
-                                                     not ";" in line]
+        line for line in reqs.read().split('\n')
+        if (line and not line.startswith('--')) and (";" not in line)]
+
 if sys.version_info[:2] == (3, 2):
     install_requires.append("tornado>=4.2,<4.4")
 else:
diff --git a/tornadis/__init__.py b/tornadis/__init__.py
index a6369a1..6ca822f 100644
--- a/tornadis/__init__.py
+++ b/tornadis/__init__.py
@@ -10,13 +10,14 @@
 DEFAULT_READ_PAGE_SIZE = 65536
 DEFAULT_WRITE_PAGE_SIZE = 65536
 
-from tornadis.utils import WriteBuffer
-from tornadis.client import Client
-from tornadis.pubsub import PubSubClient
-from tornadis.pool import ClientPool
-from tornadis.pipeline import Pipeline
-from tornadis.connection import Connection
-from tornadis.exceptions import ConnectionError, ClientError, TornadisException
+from tornadis.utils import WriteBuffer  # noqa
+from tornadis.client import Client  # noqa
+from tornadis.pubsub import PubSubClient  # noqa
+from tornadis.pool import ClientPool  # noqa
+from tornadis.pipeline import Pipeline  # noqa
+from tornadis.connection import Connection  # noqa
+from tornadis.exceptions import ConnectionError, ClientError  # noqa
+from tornadis.exceptions import TornadisException  # noqa
 
 __all__ = ['Client', 'ClientPool', 'Pipeline',
            'ConnectionError', 'ClientError', 'TornadisException',