diff --git a/src/diag.rs b/src/diag.rs
index 20387dd..6b6c213 100644
--- a/src/diag.rs
+++ b/src/diag.rs
@@ -1,6 +1,6 @@
 //! Diag protocol serialization/deserialization
 
-use chrono::{DateTime, Local, FixedOffset};
+use chrono::{DateTime, FixedOffset};
 use deku::prelude::*;
 
 #[derive(Debug, Clone, DekuWrite)]
@@ -137,7 +137,7 @@ pub fn build_log_mask_request(log_type: u32, log_mask_bitsize: u32) -> Request {
     }
 
     Request::LogConfig(LogConfigRequest::SetMask {
-        log_type: log_type as u32,
+        log_type,
         log_mask_bitsize,
         log_mask,
     })
diff --git a/src/diag_device.rs b/src/diag_device.rs
index aba508d..a35e40e 100644
--- a/src/diag_device.rs
+++ b/src/diag_device.rs
@@ -2,8 +2,7 @@ use crate::hdlc::{hdlc_encapsulate, hdlc_decapsulate, HdlcError};
 use crate::diag::{Message, ResponsePayload, Request, LogConfigRequest, LogConfigResponse, build_log_mask_request, RequestContainer, DataType, MessagesContainer};
 
 use std::fs::File;
-use std::io::{Cursor, Read, Write};
-use bytes::{Buf, BufMut};
+use std::io::Read;
 use std::os::fd::AsRawFd;
 use thiserror::Error;
 use crc::{Crc, Algorithm};
@@ -43,7 +42,6 @@ pub const CRC_CCITT_ALG: Algorithm<u16> = Algorithm {
 };
 
 const BUFFER_LEN: usize = 1024 * 1024 * 10;
-const USER_SPACE_DATA_TYPE: i32 = 32;
 const MEMORY_DEVICE_MODE: i32 = 2;
 const DIAG_IOCTL_REMOTE_DEV: u32 = 32;
 const DIAG_IOCTL_SWITCH_LOGGING: u32 = 7;
@@ -151,7 +149,7 @@ impl DiagDevice {
             }
         }
 
-        return Err(DiagDeviceError::NoResponse(req));
+        Err(DiagDeviceError::NoResponse(req))
     }
 
     fn set_log_mask(&mut self, log_type: u32, log_mask_bitsize: u32) -> DiagResult<()> {
@@ -173,7 +171,7 @@ impl DiagDevice {
             }
         }
 
-        return Err(DiagDeviceError::NoResponse(req));
+        Err(DiagDeviceError::NoResponse(req))
     }
 
     pub fn config_logs(&mut self) -> DiagResult<()> {
diff --git a/src/hdlc.rs b/src/hdlc.rs
index dcabf00..51861dd 100644
--- a/src/hdlc.rs
+++ b/src/hdlc.rs
@@ -49,8 +49,7 @@ pub fn hdlc_decapsulate(mut data: Vec<u8>, crc: &Crc<u16>) -> Result<Vec<u8>, Hd
 
     let mut unescaped = Vec::new();
     let mut escaping = false;
-    for i in 0..data.len() {
-        let b = data[i];
+    for b in data {
         if escaping {
             match b {
                 0x5e => unescaped.push(0x7e),