diff --git a/host-bmc/dbus_to_event_handler.cpp b/host-bmc/dbus_to_event_handler.cpp
index d1125f1..e8f84a6 100644
--- a/host-bmc/dbus_to_event_handler.cpp
+++ b/host-bmc/dbus_to_event_handler.cpp
@@ -49,9 +49,8 @@
         return;
     }
 
-    auto platformEventMessageResponseHandler = [](mctp_eid_t /*eid*/,
-                                                  const pldm_msg* response,
-                                                  size_t respMsgLen) {
+    auto platformEventMessageResponseHandler =
+        [](mctp_eid_t /*eid*/, const pldm_msg* response, size_t respMsgLen) {
         if (response == nullptr || !respMsgLen)
         {
             error("Failed to receive response for platform event message");
@@ -115,52 +114,50 @@
                               dbusMapping.interface.c_str()),
             [this, sensorEventDataVec, dbusValueMapping,
              dbusMapping](auto& msg) mutable {
-                DbusChangedProps props{};
-                std::string intf;
-                msg.read(intf, props);
-                if (!props.contains(dbusMapping.propertyName))
+            DbusChangedProps props{};
+            std::string intf;
+            msg.read(intf, props);
+            if (!props.contains(dbusMapping.propertyName))
+            {
+                return;
+            }
+            for (const auto& itr : dbusValueMapping)
+            {
+                bool findValue = false;
+                if (dbusMapping.propertyType == "string")
                 {
-                    return;
-                }
-                for (const auto& itr : dbusValueMapping)
-                {
-                    bool findValue = false;
-                    if (dbusMapping.propertyType == "string")
-                    {
-                        std::string src = std::get<std::string>(itr.second);
-                        std::string dst = std::get<std::string>(
-                            props.at(dbusMapping.propertyName));
+                    std::string src = std::get<std::string>(itr.second);
+                    std::string dst = std::get<std::string>(
+                        props.at(dbusMapping.propertyName));
 
-                        auto values = pldm::utils::split(src, "||", " ");
-                        for (auto& value : values)
+                    auto values = pldm::utils::split(src, "||", " ");
+                    for (auto& value : values)
+                    {
+                        if (value == dst)
                         {
-                            if (value == dst)
-                            {
-                                findValue = true;
-                                break;
-                            }
+                            findValue = true;
+                            break;
                         }
                     }
-                    else
-                    {
-                        findValue =
-                            itr.second == props.at(dbusMapping.propertyName)
-                                ? true
-                                : false;
-                    }
-
-                    if (findValue)
-                    {
-                        auto eventData =
-                            reinterpret_cast<struct pldm_sensor_event_data*>(
-                                sensorEventDataVec.data());
-                        eventData->event_class[1] = itr.first;
-                        eventData->event_class[2] = itr.first;
-                        this->sendEventMsg(PLDM_SENSOR_EVENT,
-                                           sensorEventDataVec);
-                        break;
-                    }
                 }
+                else
+                {
+                    findValue = itr.second == props.at(dbusMapping.propertyName)
+                                    ? true
+                                    : false;
+                }
+
+                if (findValue)
+                {
+                    auto eventData =
+                        reinterpret_cast<struct pldm_sensor_event_data*>(
+                            sensorEventDataVec.data());
+                    eventData->event_class[1] = itr.first;
+                    eventData->event_class[2] = itr.first;
+                    this->sendEventMsg(PLDM_SENSOR_EVENT, sensorEventDataVec);
+                    break;
+                }
+            }
             });
         stateSensorMatchs.emplace_back(std::move(stateSensorMatch));
     }
@@ -172,7 +169,7 @@
     const std::map<Type, sensorEvent> sensorHandlers = {
         {PLDM_STATE_SENSOR_PDR,
          [this](SensorId sensorId, const DbusObjMaps& dbusMaps) {
-             this->sendStateSensorEvent(sensorId, dbusMaps);
+        this->sendStateSensorEvent(sensorId, dbusMaps);
          }}};
 
     pldm_state_sensor_pdr* pdr = nullptr;