diff --git a/src/assembler.rs b/src/assembler.rs
index 2b5f740..db9e6ee 100644
--- a/src/assembler.rs
+++ b/src/assembler.rs
@@ -367,8 +367,10 @@ fn parse_zero(line: &str, regex: &Regex) -> Result<Instruction, Box<dyn Error>>
 
 #[cfg(test)]
 mod tests {
-    use crate::assembler::Assembler;
-    use crate::instruction::{decode, Instruction, Register, ShiftMode};
+    use crate::{
+        assembler::Assembler,
+        instruction::{decode, Instruction, Register, ShiftMode},
+    };
     use lazy_static::lazy_static;
     use std::fmt::{Binary, Display, LowerHex, Octal};
     use ux::{u2, u3, u4};
diff --git a/src/cpu.rs b/src/cpu.rs
index 4f86f35..49555be 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -1,11 +1,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright Murad Karammaev, Nikita Kuzmin
 
-use crate::instruction::*;
-
-use std::collections::VecDeque;
-use std::num::Wrapping;
-use std::{cmp, mem};
+use crate::instruction::{decode, Instruction, Register, ShiftMode};
+use std::{cmp, collections::VecDeque, mem, num::Wrapping};
 use ux::{u3, u4};
 
 #[allow(non_snake_case)]
diff --git a/src/instruction.rs b/src/instruction.rs
index bd16169..139dc25 100644
--- a/src/instruction.rs
+++ b/src/instruction.rs
@@ -343,7 +343,7 @@ pub fn encode(insn: Instruction) -> u8 {
 // This crate really needs more tests, but I can't be bothered
 #[cfg(test)]
 mod tests {
-    use crate::instruction::{decode, encode};
+    use super::{decode, encode};
 
     #[test]
     fn deterministic_instruction_encoding() {
diff --git a/toyasm/src/main.rs b/toyasm/src/main.rs
index 2b40dda..124d692 100644
--- a/toyasm/src/main.rs
+++ b/toyasm/src/main.rs
@@ -1,9 +1,8 @@
 use clap::Parser;
-use std::io::Write;
 use std::{
     error::Error,
     fs::{File, OpenOptions},
-    io::Read,
+    io::{Read, Write},
     path::PathBuf,
 };
 use toy_cpu_4bit::assembler::Assembler;