diff --git a/python2/typing.py b/python2/typing.py
index f79b5376..88382f14 100644
--- a/python2/typing.py
+++ b/python2/typing.py
@@ -88,8 +88,8 @@ def _qualname(x):
 
 
 def _trim_name(nm):
-    if nm.startswith('_') and nm not in ('_TypeAlias',
-                    '_ForwardRef', '_TypingBase', '_FinalTypingBase'):
+    whitelist = ('_TypeAlias', '_ForwardRef', '_TypingBase', '_FinalTypingBase')
+    if nm.startswith('_') and nm not in whitelist:
         nm = nm[1:]
     return nm
 
diff --git a/src/typing.py b/src/typing.py
index 70a7f14d..bfd7e94b 100644
--- a/src/typing.py
+++ b/src/typing.py
@@ -97,8 +97,8 @@ def _qualname(x):
 
 
 def _trim_name(nm):
-    if nm.startswith('_') and nm not in ('_TypeAlias',
-                    '_ForwardRef', '_TypingBase', '_FinalTypingBase'):
+    whitelist = ('_TypeAlias', '_ForwardRef', '_TypingBase', '_FinalTypingBase')
+    if nm.startswith('_') and nm not in whitelist:
         nm = nm[1:]
     return nm
 
@@ -455,7 +455,7 @@ def longest(x: A, y: A) -> A:
                  '__covariant__', '__contravariant__')
 
     def __init__(self, name, *constraints, bound=None,
-                covariant=False, contravariant=False):
+                 covariant=False, contravariant=False):
         super().__init__(name, *constraints, bound=bound,
                          covariant=covariant, contravariant=contravariant)
         self.__name__ = name
@@ -1776,11 +1776,11 @@ class MutableMapping(Mapping[KT, VT], extra=collections_abc.MutableMapping):
 if hasattr(collections_abc, 'Reversible'):
     if hasattr(collections_abc, 'Collection'):
         class Sequence(Reversible[T_co], Collection[T_co],
-                   extra=collections_abc.Sequence):
+                       extra=collections_abc.Sequence):
             __slots__ = ()
     else:
         class Sequence(Sized, Reversible[T_co], Container[T_co],
-                   extra=collections_abc.Sequence):
+                       extra=collections_abc.Sequence):
             __slots__ = ()
 else:
     class Sequence(Sized, Iterable[T_co], Container[T_co],
diff --git a/tox.ini b/tox.ini
index ffe95cd4..f4895cdb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,6 @@ changedir = python2
 builtins = basestring, unicode
 ignore =
   # temporary ignores until we sort it out
-  E128,
   E129,
   E501,
   W503,