pylint/pep8 cleanup