bunch of pylint and stylistic changes
Merge pull request #8511 from UtahDave/fix_pylint

bunch of pylint and stylistic changes