pylint and pep8 cleanup