pep8/pylint/sanitation cleanup