Ok.. I have to admit I have .. a bit... exaggerated...
I think I found the right compromise.. Now I update the pull request