Fix some Tox and Pep8 stuff