SONAR-3755 Small code simplification