plus some refactoring / added code on the way …
There doesn’t seem to be anything here. Maybe you should ask one :)
