Update patch set 2

Patch Set 2:

Thanks for the feedback 👍
Just for clarification, nothing else than the nit-pick is preventing the +2, right?

Patch-set: 2