Refactored the code of AnalyzerV2 class.