Pep8 adjustments.

Also removal of old tool.py.