diff --git a/include/authorization.hpp b/include/authorization.hpp
index 1fd1b12..524064e 100644
--- a/include/authorization.hpp
+++ b/include/authorization.hpp
@@ -212,8 +212,8 @@
         {
             return true;
         }
-        else if (crow::webroutes::routes.find(std::string(req.url)) !=
-                 crow::webroutes::routes.end())
+        if (crow::webroutes::routes.find(std::string(req.url)) !=
+            crow::webroutes::routes.end())
         {
             return true;
         }
diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index f8d5d4a..6bb09d0 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -1112,23 +1112,7 @@
             thisElement = &response.back();
         }
 
-        if (typeCode == "s")
-        {
-            r = readMessageItem<char*>(typeCode, m, *thisElement);
-            if (r < 0)
-            {
-                return r;
-            }
-        }
-        else if (typeCode == "g")
-        {
-            r = readMessageItem<char*>(typeCode, m, *thisElement);
-            if (r < 0)
-            {
-                return r;
-            }
-        }
-        else if (typeCode == "o")
+        if (typeCode == "s" || typeCode == "g" || typeCode == "o")
         {
             r = readMessageItem<char*>(typeCode, m, *thisElement);
             if (r < 0)