diff --git a/src/log/logd/lgs_imm.cc b/src/log/logd/lgs_imm.cc
index 76faf6c6a..7efbfb594 100644
--- a/src/log/logd/lgs_imm.cc
+++ b/src/log/logd/lgs_imm.cc
@@ -2903,18 +2903,27 @@ SaAisErrorT lgs_imm_init_configStreams(lgs_cb_t *cb) {
   }
 
   // We don't know the IMM model we are working with is the latest model
-  // or the old ones that could not have our addedd new attribute names.
+  // or the old ones that could not have our added new attribute names.
   // So, we ask helps from `saImmOmClassDescriptionGet_2`.
+  // [Lennart] Clarify. What you do here is getting a list of all
+  //           attribute names in the class. Why not just say so?
   SaImmClassCategoryT category = SA_IMM_CLASS_CONFIG;
   om_rc = immutil_saImmOmClassDescriptionGet_2(
       omHandle, const_cast<char*>(className), &category, &attr_definitions);
   osafassert(om_rc == SA_AIS_OK);
 
   // Get list of non-pure of `SaLogStreamConfig` class.
+  // [Lennart] You probably mean, "Get all cached attributes" and please use
+  //           descriptive names. E.g. list_temp and temp does not say anything
+  //           about what they are storing
   unsigned ii = 0;
   SaImmAttrDefinitionT_2* temp;
   std::vector<char*> list_temp;
   while ((temp = attr_definitions[ii++]) != nullptr) {
+    // [Lennart] Is SA_IMM_ATTR_RUNTIME correct here?
+    //           Maybe it should be SA_IMM_ATTR_CACHED?
+    //           I assume you want to create a list of all cached runtime
+    //           attributes in the class. This list will contain all attributes
     if (temp->attrFlags & SA_IMM_ATTR_RUNTIME) continue;
       list_temp.push_back(temp->attrName);
   }
@@ -2925,6 +2934,8 @@ SaAisErrorT lgs_imm_init_configStreams(lgs_cb_t *cb) {
   list_attributes[ii] = nullptr;
 
   /* Search for all objects of class "SaLogStreamConfig". */
+  // [Lennart] The comment below is confusing. The above comment already states
+  //           that the search is for all objects of this class
   /**
    * Should not base on the attribute name `safLgStrCfg`
    * as the user can create any class having that name
@@ -2940,6 +2951,9 @@ SaAisErrorT lgs_imm_init_configStreams(lgs_cb_t *cb) {
    * `safApp=safLogService` might miss configurable app stream eg: app stream
    * with DN `saLgStrCfg=test`
    */
+  // [Lennart] This comment is a bit confusing. I assume you mean the search
+  // must be done from model root since there is no restriction of where in the
+  // IMM model a stream object can be created
 
   om_rc = immutil_saImmOmSearchInitialize_2(
       omHandle, NULL, SA_IMM_SUBTREE,