SONAR-4715 Minor refactoring