diff --git a/includes/discovery/os/saf.inc.php b/includes/discovery/os/saf.inc.php
index fd9ccf0685..70bd1e68b5 100644
--- a/includes/discovery/os/saf.inc.php
+++ b/includes/discovery/os/saf.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.7571.100.1.1.5')) {
-        $os = 'saf';
-    }
+if (str_contains('.1.3.6.1.4.1.7571.100.1.1.5', $sysObjectId)) {
+    $os = 'saf';
 }
diff --git a/includes/discovery/os/samsungprinter.inc.php b/includes/discovery/os/samsungprinter.inc.php
index d5fe342997..4738f20b5e 100644
--- a/includes/discovery/os/samsungprinter.inc.php
+++ b/includes/discovery/os/samsungprinter.inc.php
@@ -1,9 +1,5 @@
 <?php
-if (!$os) {
-    if (strstr($sysDescr, 'Samsung CLX') ||
-        strstr($sysDescr, 'Samsung SCX') ||
-        strstr($sysDescr, 'Samsung C') ||
-        strstr($sysDescr, 'Samsung S')) {
-            $os = 'samsungprinter';
-    }
+
+if (str_contains($sysDescr, array('Samsung CLX', 'Samsung SCX', 'Samsung C', 'Samsung S'))) {
+    $os = 'samsungprinter';
 }
diff --git a/includes/discovery/os/sanos.inc.php b/includes/discovery/os/sanos.inc.php
index ca27c081bb..8cca3679db 100644
--- a/includes/discovery/os/sanos.inc.php
+++ b/includes/discovery/os/sanos.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'SAN-OS')) {
-        $os = 'sanos';
-    }
+if (str_contains('SAN-OS', $sysDescr)) {
+    $os = 'sanos';
 }
diff --git a/includes/discovery/os/screenos.inc.php b/includes/discovery/os/screenos.inc.php
index 4846e8dc91..11b37d5289 100644
--- a/includes/discovery/os/screenos.inc.php
+++ b/includes/discovery/os/screenos.inc.php
@@ -1,11 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.674.3224.1')) {
-        $os = 'screenos';
-    }
-
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.3224')) {
-        $os = 'screenos';
-    }
+if (str_contains($sysObjectId, array('.1.3.6.1.4.1.674.3224.1', '.1.3.6.1.4.1.3224'))) {
+    $os = 'screenos';
 }
diff --git a/includes/discovery/os/sentry3.inc.php b/includes/discovery/os/sentry3.inc.php
index b7cbea7a25..26a36b6511 100644
--- a/includes/discovery/os/sentry3.inc.php
+++ b/includes/discovery/os/sentry3.inc.php
@@ -1,18 +1,16 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^Sentry\ (Switched|Smart) /', $sysDescr)) {
-        // ServerTech doesn't have a way to distinguish between sentry3 and sentry4 devices
-        // Hopefully, we can use the version string to figure it out
-        $version = trim(snmp_get($device, 'Sentry3-MIB::serverTech.4.1.1.1.3.0', '-Osqnv'));
-        $version = explode(" ", $version);
-        $version = intval($version[1]);
+if (starts_with('Sentry', $sysDescr) && str_contains($sysDescr, array('Switched', 'Smart'))) {
+    // ServerTech doesn't have a way to distinguish between sentry3 and sentry4 devices
+    // Hopefully, we can use the version string to figure it out
+    $version = trim(snmp_get($device, 'Sentry3-MIB::serverTech.4.1.1.1.3.0', '-Osqnv'));
+    $version = explode(" ", $version);
+    $version = intval($version[1]);
 
-        // It appears that version 8 and up is good for sentry4
-        if ($version >= 8) {
-            $os = 'sentry4';
-        } else {
-            $os = 'sentry3';
-        }
+    // It appears that version 8 and up is good for sentry4
+    if ($version >= 8) {
+        $os = 'sentry4';
+    } else {
+        $os = 'sentry3';
     }
 }
diff --git a/includes/discovery/os/serveriron.inc.php b/includes/discovery/os/serveriron.inc.php
index 2ab8244c80..f8c8877eaa 100644
--- a/includes/discovery/os/serveriron.inc.php
+++ b/includes/discovery/os/serveriron.inc.php
@@ -1,18 +1,16 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/ServerIron/', $sysDescr)) {
-        $os = 'serveriron';
-        $serviron_mibs = array (
-                        "snL4slbTotalConnections"       => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Total connections in this device
-                        "snL4slbLimitExceeds"           => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // exceeds snL4TCPSynLimit (numbers of connection per second)
-                        "snL4slbForwardTraffic"         => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Client->Server
-                        "snL4slbReverseTraffic"         => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Server->Client
-                        "snL4slbFinished"               => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // FIN_or_RST
-                        "snL4FreeSessionCount"          => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Maximum sessions - used sessions
-                        "snL4unsuccessfulConn"          => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Unsuccessfull connection
-        );
+if (str_contains('ServerIron', $sysDescr)) {
+    $os = 'serveriron';
+    $serviron_mibs = array (
+        "snL4slbTotalConnections"       => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Total connections in this device
+        "snL4slbLimitExceeds"           => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // exceeds snL4TCPSynLimit (numbers of connection per second)
+        "snL4slbForwardTraffic"         => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Client->Server
+        "snL4slbReverseTraffic"         => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Server->Client
+        "snL4slbFinished"               => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // FIN_or_RST
+        "snL4FreeSessionCount"          => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Maximum sessions - used sessions
+        "snL4unsuccessfulConn"          => "FOUNDRY-SN-SW-L4-SWITCH-GROUP-MIB",  // Unsuccessfull connection
+    );
 
-        register_mibs($device, $serviron_mibs, "includes/discovery/os/serveriron.inc.php");
-    }
+    register_mibs($device, $serviron_mibs, "includes/discovery/os/serveriron.inc.php");
 }
diff --git a/includes/discovery/os/sharp.inc.php b/includes/discovery/os/sharp.inc.php
index 5b93c93f3c..f48ada211f 100644
--- a/includes/discovery/os/sharp.inc.php
+++ b/includes/discovery/os/sharp.inc.php
@@ -1,6 +1,5 @@
 <?php
-if (!$os) {
-    if (strstr($sysDescr, 'SHARP MX-')) {
-        $os = 'sharp';
-    }
+
+if (str_contains('SHARP MX-', $sysDescr)) {
+    $os = 'sharp';
 }
diff --git a/includes/discovery/os/smartax.inc.php b/includes/discovery/os/smartax.inc.php
index ff0e281f48..9ec77fd79e 100644
--- a/includes/discovery/os/smartax.inc.php
+++ b/includes/discovery/os/smartax.inc.php
@@ -23,8 +23,6 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-if (!$os) {
-    if (strpos($sysDescr, 'Huawei Integrated Access Software') !== false) {
-        $os = 'smartax';
-    }
+if (str_contains('Huawei Integrated Access Software', $sysDescr)) {
+    $os = 'smartax';
 }
diff --git a/includes/discovery/os/solaris.inc.php b/includes/discovery/os/solaris.inc.php
index 8cbcfc34a4..674c627adc 100644
--- a/includes/discovery/os/solaris.inc.php
+++ b/includes/discovery/os/solaris.inc.php
@@ -1,21 +1,18 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^SunOS/', $sysDescr)) {
-        $os              = 'solaris';
-        list(,,$version) = explode(' ', $sysDescr);
-        if ($version > '5.10') {
+if (starts_with('SunOS', $sysDescr)) {
+    $os = 'solaris';
+    list(,,$version) = explode(' ', $sysDescr);
+
+    if(version_compare($version, '5.10', '>')) {
+        if (str_contains('oi_', $sysDescr)) {
+            $os = 'openindiana';
+        } else {
             $os = 'opensolaris';
         }
-
-        if ($version > '5.10') {
-            if (preg_match('/oi_/', $sysDescr)) {
-                $os = 'openindiana';
-            }
-        }
-    }
-
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.42.2.1.1')) {
-        $os = 'solaris';
     }
 }
+
+if (str_contains('.1.3.6.1.4.1.42.2.1.1', $sysObjectId)) {
+    $os = 'solaris';
+}
diff --git a/includes/discovery/os/sonicwall.inc.php b/includes/discovery/os/sonicwall.inc.php
index 42a0f8640e..932f15d77c 100644
--- a/includes/discovery/os/sonicwall.inc.php
+++ b/includes/discovery/os/sonicwall.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'SonicWALL')) {
-        $os = 'sonicwall';
-    }
+if (str_contains('SonicWALL', $sysDescr)) {
+    $os = 'sonicwall';
 }
diff --git a/includes/discovery/os/sonus-gsx.inc.php b/includes/discovery/os/sonus-gsx.inc.php
index 1379db3713..52c6acf03d 100644
--- a/includes/discovery/os/sonus-gsx.inc.php
+++ b/includes/discovery/os/sonus-gsx.inc.php
@@ -10,8 +10,6 @@
  * the source code distribution for details.
  */
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.2879.1.1.2')) {
-        $os = 'sonus-gsx';
-    }
+if (strstr($sysObjectId, '.1.3.6.1.4.1.2879.1.1.2')) {
+    $os = 'sonus-gsx';
 }
diff --git a/includes/discovery/os/sonus-sbc.inc.php b/includes/discovery/os/sonus-sbc.inc.php
index 53c0d9e758..a9a6c9bcb6 100644
--- a/includes/discovery/os/sonus-sbc.inc.php
+++ b/includes/discovery/os/sonus-sbc.inc.php
@@ -10,8 +10,6 @@
  * the source code distribution for details.
  */
 
-if (!$os) {
-    if (starts_with($sysObjectId, array('.1.3.6.1.4.1.2879.1.9.2','.1.3.6.1.4.1.177.15.1.1.1'))) {
-        $os = 'sonus-sbc';
-    }
+if (starts_with($sysObjectId, array('.1.3.6.1.4.1.2879.1.9.2', '.1.3.6.1.4.1.177.15.1.1.1'))) {
+    $os = 'sonus-sbc';
 }
diff --git a/includes/discovery/os/speedtouch.inc.php b/includes/discovery/os/speedtouch.inc.php
index e51e02e261..4f55dc16f9 100644
--- a/includes/discovery/os/speedtouch.inc.php
+++ b/includes/discovery/os/speedtouch.inc.php
@@ -1,11 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'TG585v7')) {
-        $os = 'speedtouch';
-    } elseif (strstr($sysDescr, 'SpeedTouch ')) {
-        $os = 'speedtouch';
-    } elseif (preg_match('/^ST\d/', $sysDescr)) {
-        $os = 'speedtouch';
-    }
+if (str_contains($sysDescr, array('TG585v7', 'SpeedTouch ')) || starts_with('ST', $sysDescr)) {
+    $os = 'speedtouch';
 }
diff --git a/includes/discovery/os/sub10.inc.php b/includes/discovery/os/sub10.inc.php
index 73041fbc93..aed917cedb 100644
--- a/includes/discovery/os/sub10.inc.php
+++ b/includes/discovery/os/sub10.inc.php
@@ -3,8 +3,6 @@
  * LibreNMS Sub10 OS information module
  */
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.39003')) {
-        $os = 'sub10';
-    }
+if (str_contains('.1.3.6.1.4.1.39003', $sysObjectId)) {
+    $os = 'sub10';
 }
diff --git a/includes/discovery/os/supermicro-switch.inc.php b/includes/discovery/os/supermicro-switch.inc.php
index fd8c9a507c..f7f2066d29 100644
--- a/includes/discovery/os/supermicro-switch.inc.php
+++ b/includes/discovery/os/supermicro-switch.inc.php
@@ -1,13 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^Supermicro Switch/', $sysDescr)) {
-        $os = 'supermicro-switch';
-    }
-    if (preg_match('/^SSE-/', $sysDescr)) {
-        $os = 'supermicro-switch';
-    }
-    if (preg_match('/^SBM-/', $sysDescr)) {
-        $os = 'supermicro-switch';
-    }
+if (starts_with($sysDescr, array('Supermicro Switch', 'SSE-', 'SBM-'))) {
+    $os = 'supermicro-switch';
 }
diff --git a/includes/discovery/os/symbol.inc.php b/includes/discovery/os/symbol.inc.php
index cfee2ca173..95f8f81ca1 100644
--- a/includes/discovery/os/symbol.inc.php
+++ b/includes/discovery/os/symbol.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.388')) {
-        $os = 'symbol';
-    }
+if (str_contains('.1.3.6.1.4.1.388', $sysObjectId)) {
+    $os = 'symbol';
 }
diff --git a/includes/discovery/os/tpconductor.inc.php b/includes/discovery/os/tpconductor.inc.php
index 1113080689..9d5883b1e4 100644
--- a/includes/discovery/os/tpconductor.inc.php
+++ b/includes/discovery/os/tpconductor.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.5596.180.6.4.1')) {
-        $os = 'tpconductor';
-    }
+if (str_contains('.1.3.6.1.4.1.5596.180.6.4.1', $sysObjectId)) {
+    $os = 'tpconductor';
 }
diff --git a/includes/discovery/os/tplink.inc.php b/includes/discovery/os/tplink.inc.php
index ed8318dce2..abacd43b12 100644
--- a/includes/discovery/os/tplink.inc.php
+++ b/includes/discovery/os/tplink.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.11863.1.1')) {
-        $os = 'tplink';
-    }
+if (str_contains('.1.3.6.1.4.1.11863.1.1', $sysObjectId)) {
+    $os = 'tplink';
 }
diff --git a/includes/discovery/os/tranzeo.inc.php b/includes/discovery/os/tranzeo.inc.php
index 55d0d73e34..361ff67f8e 100644
--- a/includes/discovery/os/tranzeo.inc.php
+++ b/includes/discovery/os/tranzeo.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^Tranzeo/', $sysDescr)) {
-        $os = 'tranzeo';
-    }
+if (starts_with('Tranzeo', $sysDescr)) {
+    $os = 'tranzeo';
 }
diff --git a/includes/discovery/os/vccodec.inc.php b/includes/discovery/os/vccodec.inc.php
index f233fb46eb..f63260e411 100644
--- a/includes/discovery/os/vccodec.inc.php
+++ b/includes/discovery/os/vccodec.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.5596.150.6.4.1')) {
-        $os = 'vccodec';
-    }
+if (str_contains('.1.3.6.1.4.1.5596.150.6.4.1', $sysObjectId)) {
+    $os = 'vccodec';
 }
diff --git a/includes/discovery/os/vcs.inc.php b/includes/discovery/os/vcs.inc.php
index 9b00d82d49..a63c6a65fe 100644
--- a/includes/discovery/os/vcs.inc.php
+++ b/includes/discovery/os/vcs.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.5596.130.6.4.1')) {
-        $os = 'vcs';
-    }
+if (str_contains('.1.3.6.1.4.1.5596.130.6.4.1', $sysObjectId)) {
+    $os = 'vcs';
 }
diff --git a/includes/discovery/os/viprinux.inc.php b/includes/discovery/os/viprinux.inc.php
index a14d21c73c..daf86fc285 100644
--- a/includes/discovery/os/viprinux.inc.php
+++ b/includes/discovery/os/viprinux.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'Viprinet VPN Router')) {
-        $os = 'viprinux';
-    }
+if (str_contains('Viprinet VPN Router', $sysDescr)) {
+    $os = 'viprinux';
 }
diff --git a/includes/discovery/os/vmware.inc.php b/includes/discovery/os/vmware.inc.php
index c6cfe20b59..129b199706 100644
--- a/includes/discovery/os/vmware.inc.php
+++ b/includes/discovery/os/vmware.inc.php
@@ -1,10 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^VMware ESX/', $sysDescr)) {
-        $os = 'vmware';
-    }
-    if (preg_match('/^VMware-vCenter-Server-Appliance/', $sysDescr)) {
-        $os = 'vmware';
-    }
+if (starts_with($sysDescr, array('VMware ESX', 'VMware-vCenter-Server-Appliance'))) {
+    $os = 'vmware';
 }
diff --git a/includes/discovery/os/vrp.inc.php b/includes/discovery/os/vrp.inc.php
index b57689271e..313922de6d 100644
--- a/includes/discovery/os/vrp.inc.php
+++ b/includes/discovery/os/vrp.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (stristr($sysDescr, 'VRP (R) Software') || stristr($sysDescr, 'VRP Software Version') || stristr($sysDescr, 'Software Version VRP') || stristr($sysDescr, 'Versatile Routing Platform Software')) {
-        $os = 'vrp';
-    }
+if (str_contains($sysDescr, array('VRP (R) Software', 'VRP Software Version', 'Software Version VRP', 'Versatile Routing Platform Software'))) {
+    $os = 'vrp';
 }