pylint + pep8 improvements