Fixed sonar violations: Empty While Stmt & Security - Array is stored directly