Fix Sonar issue - Refactor nested for if while if..