diff --git a/uncompyle6/bin/uncompile.py b/uncompyle6/bin/uncompile.py
index 62bfca22..8d55e3f9 100755
--- a/uncompyle6/bin/uncompile.py
+++ b/uncompyle6/bin/uncompile.py
@@ -10,7 +10,9 @@ import os
 import sys
 import time
 
-from xdis.version_info import version_tuple_to_str
+from uncompyle6.verify import VerifyCmpError
+from uncompyle6.main import main, status_msg
+from uncompyle6.version import __version__
 
 program = "uncompyle6"
 
@@ -227,7 +229,7 @@ def main_bin():
             sys.exit(2)
         except KeyboardInterrupt:
             pass
-        except verify.VerifyCmpError:
+        except VerifyCmpError:
             raise
     else:
         from multiprocessing import Process, Queue
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
index e7e5b272..e9d58b0b 100644
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@@ -38,7 +38,6 @@ from xdis.bytecode import _get_const_info
 
 from uncompyle6.scanners.tok import Token
 from uncompyle6.scanner import parse_fn_counts_30_35
-from uncompyle6.util import get_code_name
 import xdis
 
 # Get all the opcodes into globals
@@ -574,7 +573,7 @@ class Scanner3(Scanner):
             if op in self.opc.CONST_OPS:
                 const = argval
                 if iscode(const):
-                    co_name = get_code_name(const)
+                    co_name = const.co_name
                     if co_name == "<lambda>":
                         assert opname == "LOAD_CONST"
                         opname = "LOAD_LAMBDA"
diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py
index f7a998b8..b714ddf4 100644
--- a/uncompyle6/semantics/customize3.py
+++ b/uncompyle6/semantics/customize3.py
@@ -322,7 +322,7 @@ def customize_for_version3(self, version):
         # But when derived from funcdefdeco it hasn't Would like a better
         # way to distinquish.
         if self.f.getvalue()[-4:] == "def ":
-            self.write(get_code_name(code_node.attr))
+            self.write(code_node.attr.co_name)
 
         # FIXME: handle and pass full annotate args
         make_function3_annotate(
diff --git a/uncompyle6/semantics/customize36.py b/uncompyle6/semantics/customize36.py
index 9b2c6ae9..184526c8 100644
--- a/uncompyle6/semantics/customize36.py
+++ b/uncompyle6/semantics/customize36.py
@@ -25,7 +25,6 @@ from uncompyle6.semantics.consts import (
     TABLE_DIRECT,
     TABLE_R,
 )
-from uncompyle6.util import get_code_name
 
 
 def escape_format(s):
@@ -191,7 +190,7 @@ def customize_for_version36(self, version):
                 code_node = build_class[1][1]
             else:
                 code_node = build_class[1][0]
-            class_name = get_code_name(code_node.attr)
+            class_name = code_node.attr.co_name
 
         assert "mkfunc" == build_class[1]
         mkfunc = build_class[1]
diff --git a/uncompyle6/semantics/fragments.py b/uncompyle6/semantics/fragments.py
index 13fe3e17..9dcb6da6 100644
--- a/uncompyle6/semantics/fragments.py
+++ b/uncompyle6/semantics/fragments.py
@@ -65,20 +65,20 @@ The node position 0 will be associated with "import".
 
 import re
 
-from uncompyle6.semantics import pysource
-from uncompyle6 import parser
-from uncompyle6.scanner import Token, Code, get_scanner
-import uncompyle6.parser as python_parser
-from uncompyle6.semantics.check_ast import checker
-
-from uncompyle6.show import maybe_show_asm, maybe_show_tree
-
-from uncompyle6.parsers.treenode import SyntaxTree
-
-from uncompyle6.semantics.pysource import ParserError
+from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
+from spark_parser.ast import GenericASTTraversalPruningException
 from xdis import iscode
 from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE
 
+import uncompyle6.parser as python_parser
+from uncompyle6 import parser
+from uncompyle6.parsers.treenode import SyntaxTree
+from uncompyle6.scanner import Code, Token, get_scanner
+from uncompyle6.semantics import pysource
+from uncompyle6.semantics.check_ast import checker
+from uncompyle6.semantics.pysource import ParserError
+from uncompyle6.show import maybe_show_asm, maybe_show_tree
+
 if PYTHON_VERSION_TRIPLE < (2, 5):
     from cStringIO import StringIO
 else:
@@ -86,18 +86,14 @@ else:
 
 from uncompyle6.semantics.consts import (
     INDENT_PER_LEVEL,
+    MAP,
     NONE,
+    PASS,
     PRECEDENCE,
     TABLE_DIRECT,
     escape,
-    MAP,
-    PASS,
 )
 
-from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
-from spark_parser.ast import GenericASTTraversalPruningException
-
-from xdis.version_info import PYTHON_VERSION_TRIPLE
 if PYTHON_VERSION_TRIPLE < (2, 6):
     from xdis.namedtuple24 import namedtuple
 else:
@@ -907,7 +903,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
 
     def n_generator_exp(self, node):
         start = len(self.f.getvalue())
-        self.write('(')
+        self.write("(")
         if self.version >= (3, 3):
             code_index = -6
         else:
@@ -1067,11 +1063,11 @@ class FragmentsWalker(pysource.SourceWalker, object):
                         subclass = n.attr
                         break
                     pass
-                if node == 'classdefdeco2':
+                if node == "classdefdeco2":
                     subclass_info = node
                 else:
                     subclass_info = node[0]
-            elif buildclass[1][0] == 'load_closure':
+            elif buildclass[1][0] == "load_closure":
                 # Python 3 with closures not functions
                 load_closure = buildclass[1]
                 if hasattr(load_closure[-3], "attr"):
@@ -1094,7 +1090,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
                 subclass = buildclass[1][0].attr
                 subclass_info = node[0]
         else:
-            if node == 'classdefdeco2':
+            if node == "classdefdeco2":
                 buildclass = node
             else:
                 buildclass = node[0]
diff --git a/uncompyle6/semantics/n_actions.py b/uncompyle6/semantics/n_actions.py
index 7222ca0c..e11527f4 100644
--- a/uncompyle6/semantics/n_actions.py
+++ b/uncompyle6/semantics/n_actions.py
@@ -25,12 +25,12 @@ from uncompyle6.semantics.consts import (
 
 from uncompyle6.parsers.treenode import SyntaxTree
 from uncompyle6.scanners.tok import Token
-from uncompyle6.util import better_repr, get_code_name
 
 from uncompyle6.semantics.helper import (
     find_code_node,
     flatten_list,
 )
+from uncompyle6.util import better_repr
 
 
 class NonterminalActions:
@@ -1036,7 +1036,7 @@ class NonterminalActions:
     def n_mkfunc(self, node):
         code_node = find_code_node(node, -2)
         code = code_node.attr
-        self.write(get_code_name(code))
+        self.write(code.co_name)
         self.indent_more()
 
         self.make_function(node, is_lambda=False, code_node=code_node)
diff --git a/uncompyle6/util.py b/uncompyle6/util.py
index 5a16740d..afb2495f 100644
--- a/uncompyle6/util.py
+++ b/uncompyle6/util.py
@@ -7,7 +7,7 @@ try:
     def is_negative_zero(n):
         """Returns true if n is -0.0"""
         return n == 0.0 and copysign(1, n) == -1
-except:
+except Exception:
     def is_negative_zero(n):
         return False