tox & pep8 cleanup