Fix sonar cloud cloud smells for Major and Minor