[ANALYZER-2391] - Refactorings