quality code review / fixes following SonarQube guidelines

Signed-off-by: Rémi Parain <rparain@ubidreams.com>
Signed-off-by: Rémi Parain <rparain@ubidreams.com>