diff --git a/coolamqp/events.py b/coolamqp/events.py
index e32db8da7458c25216705bae265a721ef6d97b2a..1f42085cd9d7fd6ad35498901de6969d653b0395 100644
--- a/coolamqp/events.py
+++ b/coolamqp/events.py
@@ -1,4 +1,4 @@
-#coding=UTF-8
+# coding=UTF-8
 """
 Events emitted by Cluster
 """
diff --git a/coolamqp/handler.py b/coolamqp/handler.py
index 84e5ea718dc1a3cd44e37290134d806d795583c7..fd32f62c552d9bd59c0a0c320ca4cdf53906a9e7 100644
--- a/coolamqp/handler.py
+++ b/coolamqp/handler.py
@@ -1,6 +1,6 @@
 # coding=UTF-8
 import threading
-import six.moves.queue as Queue
+from six.moves import queue
 import six
 import logging
 import collections
@@ -34,7 +34,7 @@ class ClusterHandlerThread(threading.Thread):
         self.is_terminating = False
         self.complete_outstanding_upon_termination = False
         self.order_queue = collections.deque()    # queue for inbound orders
-        self.event_queue = Queue.Queue()    # queue for tasks done
+        self.event_queue = queue.Queue()    # queue for tasks done
         self.connect_id = -1                # connectID of current connection
 
         self.declared_exchanges = {}        # declared exchanges, by their names
diff --git a/coolamqp/messages.py b/coolamqp/messages.py
index 74e068ac2d4b40c0c7782ab5831455ab4fa6f690..c1c518f145d3f1eb49b6575493d3bc09899f11d5 100644
--- a/coolamqp/messages.py
+++ b/coolamqp/messages.py
@@ -1,4 +1,4 @@
-#coding=UTF-8
+# coding=UTF-8
 import uuid
 
 
diff --git a/coolamqp/orders.py b/coolamqp/orders.py
index ca2bdee919b333f58a8830980e1ab399068b7b3a..53cbb65bfab3e60b440ca32f901aca6a731f0504 100644
--- a/coolamqp/orders.py
+++ b/coolamqp/orders.py
@@ -1,4 +1,4 @@
-#coding=UTF-8
+# coding=UTF-8
 """
 Orders that can be dispatched to ClusterHandlerThread
 """