diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp
index 9e991e7..1c5574b 100644
--- a/src/CPUSensorMain.cpp
+++ b/src/CPUSensorMain.cpp
@@ -468,15 +468,17 @@
             std::exit(EXIT_FAILURE);
         }
 
-        State newState;
-        struct peci_ping_msg msg;
+        State newState = State::OFF;
+        struct peci_ping_msg msg
+        {};
         msg.addr = config.addr;
         if (!ioctl(file, PECI_IOC_PING, &msg))
         {
             bool dimmReady = false;
             for (unsigned int rank = 0; rank < rankNumMax; rank++)
             {
-                struct peci_rd_pkg_cfg_msg msg;
+                struct peci_rd_pkg_cfg_msg msg
+                {};
                 msg.addr = config.addr;
                 msg.index = PECI_MBX_INDEX_DDR_DIMM_TEMP;
                 msg.param = rank;
@@ -505,10 +507,6 @@
                 newState = State::ON;
             }
         }
-        else
-        {
-            newState = State::OFF;
-        }
 
         close(file);