Minor cleanup

This is just some minor cleanup stuff.

I use the Eclipse IDE with the PyDev extension which automatically does some code analysis and points out those errors and warnings, which I find hard to ignore ... :-)