SONARJAVA-670 Refactoring