diff --git a/src/ir/generator/execution.rs b/src/ir/generator/execution.rs
index 57a4421..d3926f6 100644
--- a/src/ir/generator/execution.rs
+++ b/src/ir/generator/execution.rs
@@ -1,6 +1,12 @@
 use super::{jvm_frame::JvmStackFrame, MokaIRGenerationError, MokaIRGenerator};
 use crate::{
-    ir::{expression::*, Argument, Condition, Expression, LocalDef, MokaInstruction as IR},
+    ir::{
+        expression::{
+            ArrayOperation, Condition, ConversionOperation, Expression, FieldAccess, LockOperation,
+            MathOperation, NaNTreatment,
+        },
+        Argument, LocalDef, MokaInstruction as IR,
+    },
     jvm::{
         code::{Instruction, ProgramCounter},
         field::ConstantValue,
diff --git a/src/ir/generator/mod.rs b/src/ir/generator/mod.rs
index 7335879..dc615c9 100644
--- a/src/ir/generator/mod.rs
+++ b/src/ir/generator/mod.rs
@@ -20,7 +20,8 @@ use self::jvm_frame::{Entry, JvmStackFrame};
 
 pub use jvm_frame::JvmFrameError;
 
-use super::{Argument, Expression, Identifier, MokaIRMethod, MokaInstruction};
+use super::expression::Expression;
+use super::{Argument, Identifier, MokaIRMethod, MokaInstruction};
 
 #[derive(Debug, thiserror::Error)]
 pub enum MokaIRGenerationError {
diff --git a/src/ir/mod.rs b/src/ir/mod.rs
index 212f7f1..49dc6b7 100644
--- a/src/ir/mod.rs
+++ b/src/ir/mod.rs
@@ -4,7 +4,6 @@ mod moka_instruction;
 
 use std::collections::BTreeMap;
 
-pub use expression::*;
 pub use generator::{MokaIRGenerationError, MokaIRMethodExt};
 pub use moka_instruction::*;
 
diff --git a/src/ir/moka_instruction.rs b/src/ir/moka_instruction.rs
index 9787c99..b1e21ea 100644
--- a/src/ir/moka_instruction.rs
+++ b/src/ir/moka_instruction.rs
@@ -5,10 +5,11 @@ use std::{
     ops::BitOr,
 };
 
-use super::{Condition, Expression};
 use crate::jvm::code::ProgramCounter;
 use itertools::{Either, Itertools};
 
+use super::expression::{Condition, Expression};
+
 /// Represents a single instruction in the Moka IR.
 #[derive(Debug, Clone, PartialEq)]
 pub enum MokaInstruction {