Pep8 and pylint fixes