diff --git a/kernel/src/arch/x86_64/cpu/apic.rs b/kernel/src/arch/x86_64/cpu/apic.rs
index 9b78672..d7bcd97 100644
--- a/kernel/src/arch/x86_64/cpu/apic.rs
+++ b/kernel/src/arch/x86_64/cpu/apic.rs
@@ -8,7 +8,7 @@ use x86_64::{
 };
 
 use crate::arch::x86_64::cpu::msr::*;
-use crate::arch::x86_64::memory::memory::{FRAME_ALLOCATOR, OFFSET_PAGE_TABLE};
+use crate::arch::x86_64::memory::{FRAME_ALLOCATOR, OFFSET_PAGE_TABLE};
 
 const IA32_APIC_BASE_MSR: u32 = 0x1b;
 const IA32_APIC_BASE_MSR_BSP: u64 = 0x100;
diff --git a/kernel/src/arch/x86_64/interrupts.rs b/kernel/src/arch/x86_64/interrupts.rs
index 3bfb5d1..0e385f3 100644
--- a/kernel/src/arch/x86_64/interrupts.rs
+++ b/kernel/src/arch/x86_64/interrupts.rs
@@ -6,7 +6,7 @@ use x86_64::structures::paging::mapper::MapperFlushAll;
 use x86_64::structures::paging::{FrameAllocator, Mapper, Page, PageTableFlags, Size4KiB};
 
 use super::gdt;
-use crate::arch::x86_64::memory::memory::{FRAME_ALLOCATOR, OFFSET_PAGE_TABLE};
+use crate::arch::x86_64::memory::{FRAME_ALLOCATOR, OFFSET_PAGE_TABLE};
 use crate::{println_log, serial_println};
 use spin::{Lazy, Mutex};
 
diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
index 010607e..125a541 100644
--- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs
@@ -12,8 +12,10 @@
 )]
 
 extern crate alloc;
-use crate::prelude::*;
-use crate::arch::x86_64::memory::memory::{init_frame_allocator, init_page_table};
+use crate::{
+    arch::x86_64::memory::{init_frame_allocator, init_page_table},
+    prelude::*,
+};
 use arch::x86_64::memory::allocation::allocator::init_heap;
 use arch::x86_64::memory::memory_map;
 use core::arch::asm;
@@ -27,10 +29,10 @@ pub mod std;
 pub mod util;
 
 pub mod prelude {
-    pub use crate::std::io::{
-        _print, _print_log, _serial_write
+    pub use crate::std::io::{_print, _print_log, _serial_write};
+    pub use crate::{
+        print, print_log, printerr, println, println_log, printlnerr, serial_print, serial_println,
     };
-    pub use crate::{print, println, print_log, println_log, printerr, printlnerr, serial_print, serial_println};
 }
 
 /// Sets the base revision to the latest revision supported by the crate.
diff --git a/kernel/src/main.rs b/kernel/src/main.rs
index 3dcf4cb..65572c5 100644
--- a/kernel/src/main.rs
+++ b/kernel/src/main.rs
@@ -31,7 +31,5 @@ extern "C" fn kmain() -> ! {
 
     let mut executor = Executor::new();
     executor.spawn(Task::new(shell()));
-    executor.run();
-
-    loop {}
+    executor.run()
 }