This commit does not change the behaviour of the gadget.

The goal is only to make the next commit more readable.