diff --git a/src/NukiOpenerWrapper.cpp b/src/NukiOpenerWrapper.cpp
index 6c8c5e9..8209c85 100644
--- a/src/NukiOpenerWrapper.cpp
+++ b/src/NukiOpenerWrapper.cpp
@@ -1827,7 +1827,7 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value)
                     }
                 }
 
-                if(!code == 12)
+                if(code != 12)
                 {
                     String codeStr = json["code"].as<String>();
                     bool codeValid = code > 100000 && code < 1000000 && (codeStr.indexOf('0') == -1);
@@ -2086,7 +2086,7 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value)
                     entry.codeId = codeId;
                     entry.code = code;
 
-                    if(!name.length() > 0)
+                    if(name.length() < 1)
                     {
                         size_t nameLen = strlen(oldName);
                         memcpy(&entry.name, oldName, nameLen > 20 ? 20 : nameLen);
diff --git a/src/NukiWrapper.cpp b/src/NukiWrapper.cpp
index 3cb4cfb..87868bb 100644
--- a/src/NukiWrapper.cpp
+++ b/src/NukiWrapper.cpp
@@ -1468,7 +1468,7 @@ void NukiWrapper::onConfigUpdateReceived(const char *value)
                         else jsonResult[basicKeys[i]] = "invalidValue";
                     }
 
-                    if(!cmdResult == Nuki::CmdResult::Success) {
+                    if(cmdResult != Nuki::CmdResult::Success) {
                         ++_retryCount;
                     }
                     else break;
@@ -1752,7 +1752,7 @@ void NukiWrapper::onConfigUpdateReceived(const char *value)
                         else jsonResult[advancedKeys[j]] = "invalidValue";
                     }
 
-                    if(!cmdResult == Nuki::CmdResult::Success) {
+                    if(cmdResult != Nuki::CmdResult::Success) {
                         ++_retryCount;
                     }
                     else break;
@@ -2093,7 +2093,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
                     }
                 }
 
-                if(!code == 12)
+                if(code != 12)
                 {
                     String codeStr = json["code"].as<String>();
                     bool codeValid = code > 100000 && code < 1000000 && (codeStr.indexOf('0') == -1);