SONAR-4831 Refactored technical debt