* minor pylint and pep8 fixes