tox.ini edits and PEP compliance