diff --git a/src/smf/smfd/SmfUpgradeProcedure.cc b/src/smf/smfd/SmfUpgradeProcedure.cc
index 8d527d396..e20d1e5e4 100644
--- a/src/smf/smfd/SmfUpgradeProcedure.cc
+++ b/src/smf/smfd/SmfUpgradeProcedure.cc
@@ -1388,6 +1388,8 @@ bool SmfUpgradeProcedure::mergeStepIntoSingleStep(SmfUpgradeProcedure *i_proc,
   // But AU/DU at SU/Comp will not be optimized for AddRemove and will be as is,
   // because there is a chance that Su/comp can be removed if they are in the
   // scope of the node/Su.
+  // [Lennart] Readability can be enhanced by changing the iterator handling to
+  // C++ 11 as in the previous for loop
 
   std::list<unitNameAndState>::iterator addRemoveUnit_iter, mergedUnit_iter;
   for (addRemoveUnit_iter = forAddRemoveAU.begin();
@@ -1405,6 +1407,10 @@ bool SmfUpgradeProcedure::mergeStepIntoSingleStep(SmfUpgradeProcedure *i_proc,
         break;
       }
     }
+    // [Lennart] This is a lot of code to add inline it is also added twice!
+    // Create a function with a descriptive name and an explanation describing
+    // What it is doing (unless a descriptive name makes it absolutely obvious)
+
     // Find and remove any duplicate SU-level AU between suLevelDU
     // and forAddRemoveAU lists
     if (mergedUnit_iter == nodeLevelDU.end()) {