diff --git a/src/interpreter/instructions/call_core.rs b/src/interpreter/instructions/call_core.rs
index 9da19ef..fb72b33 100644
--- a/src/interpreter/instructions/call_core.rs
+++ b/src/interpreter/instructions/call_core.rs
@@ -1,10 +1,8 @@
 use crate::{
     errors::{InstructionError, InstructionErrorKind},
-    interpreter::wasm::{
-        structures::{FunctionIndex, TypedIndex},
-        values::InterfaceType,
-    },
+    interpreter::wasm::structures::{FunctionIndex, TypedIndex},
     interpreter::Instruction,
+    types::InterfaceType,
 };
 
 executable_instruction!(
diff --git a/src/interpreter/instructions/records.rs b/src/interpreter/instructions/records.rs
index a9bbda1..bdc0ff9 100644
--- a/src/interpreter/instructions/records.rs
+++ b/src/interpreter/instructions/records.rs
@@ -172,11 +172,14 @@ mod tests {
     #[test]
     #[allow(non_snake_case, unused)]
     fn test_record_lift__to_rust_struct() {
-        use crate::interpreter::{
-            instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
-            stack::Stackable,
-            wasm::values::{from_interface_values, InterfaceType, InterfaceValue},
-            Instruction, Interpreter,
+        use crate::{
+            interpreter::{
+                instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
+                stack::Stackable,
+                wasm::values::{from_interface_values, InterfaceValue},
+                Instruction, Interpreter,
+            },
+            types::InterfaceType,
         };
         use serde::Deserialize;
         use std::{cell::Cell, collections::HashMap, convert::TryInto};
diff --git a/src/interpreter/wasm/structures.rs b/src/interpreter/wasm/structures.rs
index 7d9c267..8860b0f 100644
--- a/src/interpreter/wasm/structures.rs
+++ b/src/interpreter/wasm/structures.rs
@@ -1,9 +1,6 @@
 #![allow(missing_docs)]
 
-use crate::{
-    ast,
-    interpreter::wasm::values::{InterfaceType, InterfaceValue},
-};
+use crate::{ast, interpreter::wasm::values::InterfaceValue, types::InterfaceType};
 use std::{cell::Cell, ops::Deref};
 
 pub trait TypedIndex: Copy + Clone {
diff --git a/src/interpreter/wasm/values.rs b/src/interpreter/wasm/values.rs
index bd9f6dd..73ef60e 100644
--- a/src/interpreter/wasm/values.rs
+++ b/src/interpreter/wasm/values.rs
@@ -1,6 +1,6 @@
 //! Defines WIT values and associated operations.
 
-pub use crate::types::{InterfaceType, RecordType};
+use crate::types::{InterfaceType, RecordType};
 use crate::{errors::WasmValueNativeCastError, vec1::Vec1};
 use std::{convert::TryFrom, slice::Iter};
 
diff --git a/src/macros.rs b/src/macros.rs
index be60ac0..5a7e743 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -96,11 +96,14 @@ macro_rules! test_executable_instruction {
         #[test]
         #[allow(non_snake_case, unused)]
         fn $test_name() {
-            use crate::interpreter::{
-                instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
-                stack::Stackable,
-                wasm::values::{InterfaceType, InterfaceValue},
-                Instruction, Interpreter,
+            use crate::{
+                interpreter::{
+                    instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
+                    stack::Stackable,
+                    wasm::values::InterfaceValue,
+                    Instruction, Interpreter,
+                },
+                types::InterfaceType,
             };
             use std::{cell::Cell, collections::HashMap, convert::TryInto};
 
@@ -135,11 +138,14 @@ macro_rules! test_executable_instruction {
         #[test]
         #[allow(non_snake_case, unused)]
         fn $test_name() {
-            use crate::interpreter::{
-                instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
-                stack::Stackable,
-                wasm::values::{InterfaceType, InterfaceValue},
-                Instruction, Interpreter,
+            use crate::{
+                interpreter::{
+                    instructions::tests::{Export, Instance, LocalImport, Memory, MemoryView},
+                    stack::Stackable,
+                    wasm::values::InterfaceValue,
+                    Instruction, Interpreter,
+                },
+                types::InterfaceType,
             };
             use std::{cell::Cell, collections::HashMap, convert::TryInto};