pylint + pep8 fixes