Jupp, is a leftover.

Sorry for leaving fragments of my coding style in here from the first iteration - I'll adjust it where you mentioned it and where in addition I'll come across.