ENYO-2405: Pull request remarks

Some remarks made in the pull request are treated in this commit. The others will be fixed as soon as the bug in this branch will be fixed.