Fix sonar cloud cloud smells for Blocker and Critical

Fix Blocker and Critical code smells https://sonarcloud.io/project/issues?resolved=false&severities=BLOCKER&sinceLeakPeriod=true&types=CODE_SMELL&id=cern-cta_CTA