Quality cleanup

Clean up various pep8/pylint violations