fixup! Pep8 and Pylint fixes