Small style fixes for tox testing