PEP8 fixes, fixed tox formatting