pep8/pylint cleanups