Added Tox
Style cleanups