pep8 and pylint fixes