Some clean ups

Pylint is still complaining about the global declaration and thinks, my
globals would be constants and should therefore be upper case...

Don't know yet how to deal with that.