diff --git a/src/devices/cloud_iii_wireless.rs b/src/devices/cloud_iii_wireless.rs
index 408aa94..9a425d0 100644
--- a/src/devices/cloud_iii_wireless.rs
+++ b/src/devices/cloud_iii_wireless.rs
@@ -210,8 +210,8 @@ impl Device for CloudIIIWireless {
             (GET_SILENT_MODE_CMD_ID, silent, ..) => Some(vec![DeviceEvent::Silent(silent == 1)]),
             (GET_SIRK_CMD_ID, ..) => {
                 let mut flag = false;
-                for i in 2..18 {
-                    if response[i] != 0 {
+                for item in response.iter().take(18).skip(2) {
+                    if item != &0u8 {
                         flag = true;
                         break;
                     }
diff --git a/src/devices/mod.rs b/src/devices/mod.rs
index eec3e6b..0cb9d6a 100644
--- a/src/devices/mod.rs
+++ b/src/devices/mod.rs
@@ -226,11 +226,7 @@ impl DeviceState {
         self.get_display_data()
             .iter()
             .filter_map(|(prefix, data, suffix, _)| {
-                if let Some(data) = data {
-                    Some(format!("{:<padding$} {}{}", prefix, data, suffix))
-                } else {
-                    None
-                }
+                data.as_ref().map(|data| format!("{:<padding$} {}{}", prefix, data, suffix))
             })
             .collect::<Vec<String>>()
             .join("\n")