SONAR-4357 Little refactoring