diff --git a/doc/requirements.txt b/doc/requirements.txt
index 76d5308..493eb54 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,3 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
 sphinx>=2.0.0,!=2.1.0 # BSD
 openstackdocstheme>=2.2.0 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
diff --git a/requirements.txt b/requirements.txt
index 0487f1e..a3e42c2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,6 @@
 # Requirements lower bounds listed here are our best effort to keep them up to
 # date but we do not test them so no guarantee of having them all correct. If
-# you find any incorrect lower bounds, let us know or propose a fix. 
-
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
+# you find any incorrect lower bounds, let us know or propose a fix.
 
 pbr>=3.1.1 # Apache-2.0
 cliff!=2.9.0,>=2.8.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 04bbf93..cbe1780 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,4 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 coverage>=4.5.1 # Apache-2.0
 python-subunit>=1.2.0 # Apache-2.0/BSD
 oslotest>=3.3.0 # Apache-2.0
diff --git a/vitrageclient/common/formatters.py b/vitrageclient/common/formatters.py
index 6642be0..4e36a24 100644
--- a/vitrageclient/common/formatters.py
+++ b/vitrageclient/common/formatters.py
@@ -73,9 +73,9 @@ class GraphFormatter(base.SingleFormatter, metaclass=abc.ABCMeta):
     @staticmethod
     def _list2str(node):
         for k, v in node.items():
-            if type(v) == list:
+            if type(v) is list:
                 node[k] = str(v)
-            if type(v) == str and ":" in v:
+            if type(v) is str and ":" in v:
                 node[k] = '"' + v + '"'
 
     @abc.abstractmethod