GDM-192: sonarqube optimalisations

Indeed, I'll remove it after the pull request is merged.