Pylint and pep8 fixes