Pep8/Pylint fixes