diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 007343334e5f6928dca4a981034bfa5150de2bd9..63f724373dd94cf95be6da977029fb7c3fa1d6f6 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -665,9 +665,8 @@ Foam::label Foam::polyTopoChange::getCellOrder
                 nbrs.clear();
                 weights.clear();
 
-                forAll(neighbours, nI)
+                for (const label nbr : neighbours)
                 {
-                    label nbr = neighbours[nI];
                     if (!cellRemoved(nbr) && !visited.test(nbr))
                     {
                         // not visited, add to the list
@@ -678,9 +677,9 @@ Foam::label Foam::polyTopoChange::getCellOrder
                 // 2. Sort
                 sortedOrder(weights, order);
                 // 3. Add in sorted order
-                forAll(order, i)
+                for (const label nbri : order)
                 {
-                    nextCell.append(nbrs[i]);
+                    nextCell.append(nbrs[nbri]);
                 }
             }
         }