diff --git a/python/Scripts/generateshader.py b/python/Scripts/generateshader.py
index 038625eacf..f6158d270a 100644
--- a/python/Scripts/generateshader.py
+++ b/python/Scripts/generateshader.py
@@ -25,7 +25,7 @@ def validateCode(sourceCodeFile, codevalidator, codevalidatorArgs):
         print(cmd_flatten)
         try:
             output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
-            result = output.decode(encoding='utf-8')
+            return output.decode(encoding='utf-8')
         except subprocess.CalledProcessError as out:                                                                                                   
             return (out.output.decode(encoding='utf-8'))
     return ""
@@ -83,7 +83,7 @@ def main():
         try:
             mx.loadLibraries(libraryFolders, searchPath, stdlib)
             doc.importLibrary(stdlib)
-        except err:
+        except Exception as err:
             print('Generation failed: "', err, '"')
             sys.exit(-1)
 
diff --git a/python/Scripts/genmdl.py b/python/Scripts/genmdl.py
index f42add0425..ded1021554 100644
--- a/python/Scripts/genmdl.py
+++ b/python/Scripts/genmdl.py
@@ -3,9 +3,11 @@
 Generate MDL implementation directory based on MaterialX nodedefs
 '''
 
-import sys
 import os
-import string; os.environ['PYTHONIOENCODING'] = 'utf-8'
+import sys
+
+os.environ['PYTHONIOENCODING'] = 'utf-8'
+
 import MaterialX as mx
 
 def usage():
@@ -345,7 +347,7 @@ def main():
 
     doc = mx.createDocument()
     searchPath = os.path.join(_startPath, 'libraries')
-    libraryPath = os.path.join(searchPath, 'stdlib')
+    libraryPath = os.path.join(searchPath, LIBRARY)
     _loadLibraries(doc, searchPath, libraryPath)
 
     DEFINITION_PREFIX = 'ND_'
@@ -522,7 +524,7 @@ def main():
             if isinstance(elem, mx.Output):
                 outputValue = elem.getAttribute('default')
                 if outputValue == '[]':
-                    outputvalue = ''
+                    outputValue = ''
                 if not outputValue:
                     outputValue = elem.getAttribute('defaultinput')
                     if outputValue:
diff --git a/python/Scripts/mxdoc.py b/python/Scripts/mxdoc.py
index 7ee21eb8e5..7c9ba09a07 100644
--- a/python/Scripts/mxdoc.py
+++ b/python/Scripts/mxdoc.py
@@ -3,7 +3,9 @@
 Print markdown documentation for each nodedef in the given document.
 '''
 
-import sys, os, argparse
+import argparse
+import sys
+
 import MaterialX as mx
 
 HEADERS = ('Name', 'Type', 'Default Value',
diff --git a/python/Scripts/mxformat.py b/python/Scripts/mxformat.py
index 8f6ad731e1..0b327883bd 100644
--- a/python/Scripts/mxformat.py
+++ b/python/Scripts/mxformat.py
@@ -4,7 +4,9 @@
 the documents to the latest version of the standard.
 '''
 
-import sys, os, argparse
+import argparse
+import os
+
 import MaterialX as mx
 
 def main():
diff --git a/python/Scripts/mxvalidate.py b/python/Scripts/mxvalidate.py
index e251b4599b..8b5271e9ed 100755
--- a/python/Scripts/mxvalidate.py
+++ b/python/Scripts/mxvalidate.py
@@ -3,7 +3,9 @@
 Verify that the given file is a valid MaterialX document.
 '''
 
-import sys, os, argparse
+import argparse
+import sys
+
 import MaterialX as mx
 
 def main():
@@ -25,7 +27,7 @@ def main():
         stdlib = mx.createDocument()
         try:
             mx.loadLibraries(mx.getDefaultDataLibraryFolders(), mx.getDefaultDataSearchPath(), stdlib)            
-        except err:
+        except Exception as err:
             print(err)
             sys.exit(0)
         doc.importLibrary(stdlib)