New tox options, code cleanup, version bump to 1.5.4