pep8 and pylint clean-up