diff --git a/Cargo.toml b/Cargo.toml
index c21d2986..c3c0320a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@ name = "sawtooth-devmode-engine-rust"
 version = "1.2.5"
 authors = ["Intel Corporation"]
 description = "Hyperledger Sawtooth DevMode Rust consensus engine"
+edition = "2021"
 
 [[bin]]
 name = "devmode-engine-rust"
diff --git a/src/engine.rs b/src/engine.rs
index 248689be..4cba4255 100644
--- a/src/engine.rs
+++ b/src/engine.rs
@@ -15,16 +15,19 @@
  * ------------------------------------------------------------------------------
  */
 
-use std::fmt::{self, Write};
-use std::str::FromStr;
-use std::sync::mpsc::{Receiver, RecvTimeoutError};
-use std::thread::sleep;
-use std::time;
-
-use rand;
-use rand::Rng;
-
-use sawtooth_sdk::consensus::{engine::*, service::Service};
+use std::{
+    fmt::{self, Write},
+    str::FromStr,
+    sync::mpsc::{Receiver, RecvTimeoutError},
+    thread::sleep,
+    time,
+};
+
+use rand::{thread_rng, Rng};
+use sawtooth_sdk::consensus::{
+    engine::{Block, BlockId, Engine, Error, PeerId, StartupState, Update},
+    service::Service,
+};
 
 const DEFAULT_WAIT_TIME: u64 = 0;
 const NULL_BLOCK_IDENTIFIER: [u8; 8] = [0, 0, 0, 0, 0, 0, 0, 0];
@@ -141,7 +144,7 @@ impl DevmodeService {
             Ok(_) => {}
             Err(Error::InvalidState(_)) => {}
             Err(err) => {
-                panic!("Failed to cancel block: {:?}", err);
+                panic!("Failed to cancel block: {err:?}");
             }
         };
     }
@@ -200,7 +203,7 @@ impl DevmodeService {
             if min_wait_time >= max_wait_time {
                 DEFAULT_WAIT_TIME
             } else {
-                rand::thread_rng().gen_range(min_wait_time, max_wait_time)
+                thread_rng().gen_range(min_wait_time, max_wait_time)
             }
         } else {
             DEFAULT_WAIT_TIME
diff --git a/src/main.rs b/src/main.rs
index e38e4c8d..f1d0f87f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,24 +15,23 @@
  * ------------------------------------------------------------------------------
  */
 
-#[macro_use]
-extern crate clap;
-#[macro_use]
-extern crate log;
-extern crate log4rs;
-extern crate rand;
-extern crate sawtooth_sdk;
-
 mod engine;
 
 use std::process;
 
-use log::LevelFilter;
-use log4rs::append::console::ConsoleAppender;
-use log4rs::config::{Appender, Config, Root};
-use log4rs::encode::pattern::PatternEncoder;
+#[macro_use]
+extern crate clap;
+#[macro_use]
+extern crate log;
 
 use engine::DevmodeEngine;
+use log::LevelFilter;
+use log4rs::{
+    append::console::ConsoleAppender,
+    config::{Appender, Root},
+    encode::pattern::PatternEncoder,
+    init_config, Config,
+};
 use sawtooth_sdk::consensus::zmq_driver::ZmqDriver;
 
 fn main() {
@@ -67,10 +66,10 @@ fn main() {
         .build(Root::builder().appender("stdout").build(console_log_level))
         .unwrap_or_else(|err| {
             error!("{}", err);
-            process::exit(1);
+            process::exit(1)
         });
 
-    log4rs::init_config(config).unwrap_or_else(|err| {
+    init_config(config).unwrap_or_else(|err| {
         error!("{}", err);
         process::exit(1);
     });