small cleanups

While you are at it, might as well cleanup these. (Found using my pylint/pyflakes/pep8 combo).

If you like, I can also work on reducing to <80 char per line (part of pep8).