Pylint/Pep8 fixes