pep8 and pylint cleanup