diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino
index 4323b13..85ffd45 100644
--- a/examples/BASIC/BASIC.ino
+++ b/examples/BASIC/BASIC.ino
@@ -516,16 +516,16 @@ static void updatePm(void) {
     ag.pms5003.resetFailCount();
   } else {
     ag.pms5003.updateFailCount();
-    Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount());
+    Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount());
     if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-      measurements.pm01_1 = utils::getInvalidPMS();
-      measurements.pm25_1 = utils::getInvalidPMS();
-      measurements.pm10_1 = utils::getInvalidPMS();
-      measurements.pm03PCount_1 = utils::getInvalidPMS();
+      measurements.pm01_1 = utils::getInvalidPmValue();
+      measurements.pm25_1 = utils::getInvalidPmValue();
+      measurements.pm10_1 = utils::getInvalidPmValue();
+      measurements.pm03PCount_1 = utils::getInvalidPmValue();
     }
 
     if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) {
-      Serial.printf("Restarting...");
+      Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax());
       ESP.restart();
     }
   }
diff --git a/examples/BASIC/OpenMetrics.cpp b/examples/BASIC/OpenMetrics.cpp
index 3392d97..5737a10 100644
--- a/examples/BASIC/OpenMetrics.cpp
+++ b/examples/BASIC/OpenMetrics.cpp
@@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) {
 
   float _temp = utils::getInvalidTemperature();
   float _hum = utils::getInvalidHumidity();
-  int pm01 = utils::getInvalidPMS();
-  int pm25 = utils::getInvalidPMS();
-  int pm10 = utils::getInvalidPMS();
-  int pm03PCount = utils::getInvalidPMS();
+  int pm01 = utils::getInvalidPmValue();
+  int pm25 = utils::getInvalidPmValue();
+  int pm10 = utils::getInvalidPmValue();
+  int pm03PCount = utils::getInvalidPmValue();
   int atmpCompensated = utils::getInvalidTemperature();
   int ahumCompensated = utils::getInvalidHumidity();
 
diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
index 2f4d663..7ecc082 100644
--- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
+++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
@@ -568,16 +568,16 @@ static void updatePm(void) {
     ag.pms5003.resetFailCount();
   } else {
     ag.pms5003.updateFailCount();
-    Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount());
+    Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount());
     if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-      measurements.pm01_1 = utils::getInvalidPMS();
-      measurements.pm25_1 = utils::getInvalidPMS();
-      measurements.pm10_1 = utils::getInvalidPMS();
-      measurements.pm03PCount_1 = utils::getInvalidPMS();
+      measurements.pm01_1 = utils::getInvalidPmValue();
+      measurements.pm25_1 = utils::getInvalidPmValue();
+      measurements.pm10_1 = utils::getInvalidPmValue();
+      measurements.pm03PCount_1 = utils::getInvalidPmValue();
     }
 
     if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) {
-      Serial.printf("Restarting...");
+      Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax());
       ESP.restart();
     }
   }
diff --git a/examples/DiyProIndoorV3_3/OpenMetrics.cpp b/examples/DiyProIndoorV3_3/OpenMetrics.cpp
index 3392d97..5737a10 100644
--- a/examples/DiyProIndoorV3_3/OpenMetrics.cpp
+++ b/examples/DiyProIndoorV3_3/OpenMetrics.cpp
@@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) {
 
   float _temp = utils::getInvalidTemperature();
   float _hum = utils::getInvalidHumidity();
-  int pm01 = utils::getInvalidPMS();
-  int pm25 = utils::getInvalidPMS();
-  int pm10 = utils::getInvalidPMS();
-  int pm03PCount = utils::getInvalidPMS();
+  int pm01 = utils::getInvalidPmValue();
+  int pm25 = utils::getInvalidPmValue();
+  int pm10 = utils::getInvalidPmValue();
+  int pm03PCount = utils::getInvalidPmValue();
   int atmpCompensated = utils::getInvalidTemperature();
   int ahumCompensated = utils::getInvalidHumidity();
 
diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
index a0a42df..ac78467 100644
--- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
+++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
@@ -611,16 +611,16 @@ static void updatePm(void) {
     ag.pms5003.resetFailCount();
   } else {
     ag.pms5003.updateFailCount();
-    Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount());
+    Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount());
     if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-      measurements.pm01_1 = utils::getInvalidPMS();
-      measurements.pm25_1 = utils::getInvalidPMS();
-      measurements.pm10_1 = utils::getInvalidPMS();
-      measurements.pm03PCount_1 = utils::getInvalidPMS();
+      measurements.pm01_1 = utils::getInvalidPmValue();
+      measurements.pm25_1 = utils::getInvalidPmValue();
+      measurements.pm10_1 = utils::getInvalidPmValue();
+      measurements.pm03PCount_1 = utils::getInvalidPmValue();
     }
 
     if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) {
-      Serial.printf("Restarting...");
+      Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax());
       ESP.restart();
     }
   }
diff --git a/examples/DiyProIndoorV4_2/OpenMetrics.cpp b/examples/DiyProIndoorV4_2/OpenMetrics.cpp
index 3392d97..5737a10 100644
--- a/examples/DiyProIndoorV4_2/OpenMetrics.cpp
+++ b/examples/DiyProIndoorV4_2/OpenMetrics.cpp
@@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) {
 
   float _temp = utils::getInvalidTemperature();
   float _hum = utils::getInvalidHumidity();
-  int pm01 = utils::getInvalidPMS();
-  int pm25 = utils::getInvalidPMS();
-  int pm10 = utils::getInvalidPMS();
-  int pm03PCount = utils::getInvalidPMS();
+  int pm01 = utils::getInvalidPmValue();
+  int pm25 = utils::getInvalidPmValue();
+  int pm10 = utils::getInvalidPmValue();
+  int pm03PCount = utils::getInvalidPmValue();
   int atmpCompensated = utils::getInvalidTemperature();
   int ahumCompensated = utils::getInvalidHumidity();
 
diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino
index a6bf7c3..5f9e0fe 100644
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -1005,7 +1005,7 @@ static void updateTvoc(void) {
 }
 
 static void updatePm(void) {
-  bool failToRestart = false;
+  bool restart = false;
   if (ag->isOne()) {
     if (ag->pms5003.isFailed() == false) {
       measurements.pm01_1 = ag->pms5003.getPm01Ae();
@@ -1021,16 +1021,16 @@ static void updatePm(void) {
       ag->pms5003.resetFailCount();
     } else {
       ag->pms5003.updateFailCount();
-      Serial.printf("PMS read failed: %d\r\n", ag->pms5003.getFailCount());
+      Serial.printf("PMS read faile %d times\r\n", ag->pms5003.getFailCount());
       if (ag->pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-        measurements.pm01_1 = utils::getInvalidPMS();
-        measurements.pm25_1 = utils::getInvalidPMS();
-        measurements.pm10_1 = utils::getInvalidPMS();
-        measurements.pm03PCount_1 = utils::getInvalidPMS();
+        measurements.pm01_1 = utils::getInvalidPmValue();
+        measurements.pm25_1 = utils::getInvalidPmValue();
+        measurements.pm10_1 = utils::getInvalidPmValue();
+        measurements.pm03PCount_1 = utils::getInvalidPmValue();
       }
 
       if (ag->pms5003.getFailCount() >= ag->pms5003.getFailCountMax()) {
-        failToRestart = true;
+        restart = true;
       }
     }
   } else {
@@ -1062,19 +1062,19 @@ static void updatePm(void) {
     } else {
       if (configuration.hasSensorPMS1) {
         ag->pms5003t_1.updateFailCount();
-        Serial.printf("[1] PMS read failed: %d\r\n", ag->pms5003t_1.getFailCount());
+        Serial.printf("[1] PMS read failed %d times\r\n", ag->pms5003t_1.getFailCount());
 
         if (ag->pms5003t_1.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-          measurements.pm01_1 = utils::getInvalidPMS();
-          measurements.pm25_1 = utils::getInvalidPMS();
-          measurements.pm10_1 = utils::getInvalidPMS();
-          measurements.pm03PCount_1 = utils::getInvalidPMS();
+          measurements.pm01_1 = utils::getInvalidPmValue();
+          measurements.pm25_1 = utils::getInvalidPmValue();
+          measurements.pm10_1 = utils::getInvalidPmValue();
+          measurements.pm03PCount_1 = utils::getInvalidPmValue();
           measurements.temp_1 = utils::getInvalidTemperature();
           measurements.hum_1 = utils::getInvalidHumidity();
         }
 
         if (ag->pms5003t_1.getFailCount() >= ag->pms5003t_1.getFailCountMax()) {
-          failToRestart = true;
+          restart = true;
         }
       }
     }
@@ -1105,19 +1105,19 @@ static void updatePm(void) {
     } else {
       if (configuration.hasSensorPMS2) {
         ag->pms5003t_2.updateFailCount();
-        Serial.printf("[2] PMS read failed: %d\r\n", ag->pms5003t_2.getFailCount());
+        Serial.printf("[2] PMS read failed %d times\r\n", ag->pms5003t_2.getFailCount());
 
         if (ag->pms5003t_2.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-          measurements.pm01_2 = utils::getInvalidPMS();
-          measurements.pm25_2 = utils::getInvalidPMS();
-          measurements.pm10_2 = utils::getInvalidPMS();
-          measurements.pm03PCount_2 = utils::getInvalidPMS();
+          measurements.pm01_2 = utils::getInvalidPmValue();
+          measurements.pm25_2 = utils::getInvalidPmValue();
+          measurements.pm10_2 = utils::getInvalidPmValue();
+          measurements.pm03PCount_2 = utils::getInvalidPmValue();
           measurements.temp_2 = utils::getInvalidTemperature();
           measurements.hum_2 = utils::getInvalidHumidity();
         }
 
         if (ag->pms5003t_2.getFailCount() >= ag->pms5003t_2.getFailCountMax()) {
-          failToRestart = true;
+          restart = true;
         }
       }
     }
@@ -1220,8 +1220,8 @@ static void updatePm(void) {
     }
   }
 
-  if (failToRestart) {
-    Serial.printf("Restarting...");
+  if (restart) {
+    Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax());
     ESP.restart();
   }
 }
diff --git a/examples/OneOpenAir/OpenMetrics.cpp b/examples/OneOpenAir/OpenMetrics.cpp
index c458a8c..ada9871 100644
--- a/examples/OneOpenAir/OpenMetrics.cpp
+++ b/examples/OneOpenAir/OpenMetrics.cpp
@@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) {
 
   float _temp = utils::getInvalidTemperature();
   float _hum = utils::getInvalidHumidity();
-  int pm01 = utils::getInvalidPMS();
-  int pm25 = utils::getInvalidPMS();
-  int pm10 = utils::getInvalidPMS();
-  int pm03PCount = utils::getInvalidPMS();
+  int pm01 = utils::getInvalidPmValue();
+  int pm25 = utils::getInvalidPmValue();
+  int pm10 = utils::getInvalidPmValue();
+  int pm03PCount = utils::getInvalidPmValue();
   int atmpCompensated = utils::getInvalidTemperature();
   int ahumCompensated = utils::getInvalidHumidity();
   if (config.hasSensorPMS1 && config.hasSensorPMS2) {
diff --git a/src/Main/utils.cpp b/src/Main/utils.cpp
index 1c8175d..6a4d0e1 100644
--- a/src/Main/utils.cpp
+++ b/src/Main/utils.cpp
@@ -82,7 +82,7 @@ float utils::getInvalidHumidity(void) { return INVALID_HUMIDITY; }
 
 int utils::getInvalidCO2(void) { return INVALID_CO2; }
 
-int utils::getInvalidPMS(void) { return INVALID_PMS; }
+int utils::getInvalidPmValue(void) { return INVALID_PMS; }
 
 int utils::getInvalidNOx(void) { return INVALID_NOX; }
 
diff --git a/src/Main/utils.h b/src/Main/utils.h
index 841d5ec..a1efa93 100644
--- a/src/Main/utils.h
+++ b/src/Main/utils.h
@@ -21,7 +21,7 @@ public:
   static float getInvalidTemperature(void);
   static float getInvalidHumidity(void);
   static int getInvalidCO2(void);
-  static int getInvalidPMS(void);
+  static int getInvalidPmValue(void);
   static int getInvalidNOx(void);
   static int getInvalidVOC(void);
 };
diff --git a/src/PMS/PMS.cpp b/src/PMS/PMS.cpp
index 0629d05..1d1ad1c 100644
--- a/src/PMS/PMS.cpp
+++ b/src/PMS/PMS.cpp
@@ -158,11 +158,7 @@ void PMSBase::updateFailCount(void) {
   }
 }
 
-/**
- * @brief Reset number of fail
- * 
- */
-void PMSBase::resetFailCount(void) {failCount = 0;}
+void PMSBase::resetFailCount(void) { failCount = 0; }
 
 /**
  * @brief Get number of fail
@@ -171,11 +167,6 @@ void PMSBase::resetFailCount(void) {failCount = 0;}
  */
 int PMSBase::getFailCount(void) { return failCount; }
 
-/**
- * @brief Get maximum of fail count max
- * 
- * @return int 
- */
 int PMSBase::getFailCountMax(void) { return failCountMax; }
 
 /**
diff --git a/src/PMS/PMS5003.cpp b/src/PMS/PMS5003.cpp
index 8bed516..73dd569 100644
--- a/src/PMS/PMS5003.cpp
+++ b/src/PMS/PMS5003.cpp
@@ -176,18 +176,10 @@ void PMS5003::handle(void) { pms.handle(); }
  */
 bool PMS5003::isFailed(void) { return pms.isFailed(); }
 
-/**
- * @brief Increate number of fail
- * 
- */
 void PMS5003::updateFailCount(void) {
   pms.updateFailCount();
 }
 
-/**
- * @brief Reset fail count
- * 
- */
 void PMS5003::resetFailCount(void) {
   pms.resetFailCount();
 }
diff --git a/src/PMS/PMS5003T.cpp b/src/PMS/PMS5003T.cpp
index b3ad9fc..8493504 100644
--- a/src/PMS/PMS5003T.cpp
+++ b/src/PMS/PMS5003T.cpp
@@ -216,18 +216,10 @@ void PMS5003T::handle(void) { pms.handle(); }
  */
 bool PMS5003T::isFailed(void) { return pms.isFailed(); }
 
-/**
- * @brief Increate number of fail
- * 
- */
 void PMS5003T::updateFailCount(void) {
   pms.updateFailCount();
 }
 
-/**
- * @brief Reset fail count
- * 
- */
 void PMS5003T::resetFailCount(void) {
   pms.resetFailCount();
 }