diff --git a/ast/src/reducer/canonicalization.rs b/ast/src/reducer/canonicalization.rs
index 2976c01d5f..c8aa3a4843 100644
--- a/ast/src/reducer/canonicalization.rs
+++ b/ast/src/reducer/canonicalization.rs
@@ -19,30 +19,36 @@
 
 use crate::{
     reducer::ReconstructingReducer,
+    Block,
+    CallExpression,
     Circuit,
+    CircuitInitExpression,
     CircuitMember,
+    CircuitMemberAccessExpression,
+    CircuitStaticFunctionAccessExpression,
+    DefinitionStatement,
+    Expression,
+    ExpressionStatement,
     Function,
     FunctionInput,
     FunctionInputVariable,
     Identifier,
+    ReturnStatement,
+    Statement,
     Type,
 };
 
 pub struct Canonicalizer;
 
 impl Canonicalizer {
-    fn is_self(&self, identifier: &Identifier) -> bool {
-        match identifier.name.as_str() {
-            "Self" => true,
-            _ => false,
-        }
+    fn _is_self(&self, identifier: &Identifier) -> bool {
+        matches!(identifier.name.as_str(), "Self")
     }
 
-    fn is_self_keyword(&self, function_inputs: &Vec<FunctionInput>) -> bool {
+    fn _is_self_keyword(&self, function_inputs: &[FunctionInput]) -> bool {
         for function_input in function_inputs {
-            match function_input {
-                FunctionInput::SelfKeyword(_) => return true,
-                _ => {}
+            if let FunctionInput::SelfKeyword(_) = function_input {
+                return true;
             }
         }
 
@@ -50,16 +56,10 @@ impl Canonicalizer {
     }
 
     fn is_self_type(&self, type_option: Option<&Type>) -> bool {
-        match type_option {
-            Some(type_) => match type_ {
-                Type::SelfType => true,
-                _ => false,
-            },
-            None => false,
-        }
+        matches!(type_option, Some(Type::SelfType))
     }
 
-    fn canonicalize_function_input(&self, function_input: &FunctionInput, circuit_name: &Identifier) -> FunctionInput {
+    fn _canonicalize_function_input(&self, function_input: &FunctionInput, circuit_name: &Identifier) -> FunctionInput {
         match function_input {
             FunctionInput::SelfKeyword(self_keyword) => {
                 return FunctionInput::Variable(FunctionInputVariable {
@@ -85,12 +85,104 @@ impl Canonicalizer {
         function_input.clone()
     }
 
+    fn canonicalize_expression(&self, expression: &Expression, circuit_name: &Identifier) -> Expression {
+        match expression {
+            Expression::CircuitInit(circuit_init) => {
+                return Expression::CircuitInit(CircuitInitExpression {
+                    name: circuit_name.clone(),
+                    members: circuit_init.members.clone(),
+                    span: circuit_init.span.clone(),
+                });
+            }
+            Expression::CircuitMemberAccess(circuit_member_access) => {
+                return Expression::CircuitMemberAccess(CircuitMemberAccessExpression {
+                    circuit: Box::new(self.canonicalize_expression(&circuit_member_access.circuit, circuit_name)),
+                    name: circuit_member_access.name.clone(),
+                    span: circuit_member_access.span.clone(),
+                });
+            }
+            Expression::CircuitStaticFunctionAccess(circuit_static_func_access) => {
+                return Expression::CircuitStaticFunctionAccess(CircuitStaticFunctionAccessExpression {
+                    circuit: Box::new(self.canonicalize_expression(&circuit_static_func_access.circuit, circuit_name)),
+                    name: circuit_static_func_access.name.clone(),
+                    span: circuit_static_func_access.span.clone(),
+                });
+            }
+            Expression::Call(call) => {
+                return Expression::Call(CallExpression {
+                    function: Box::new(self.canonicalize_expression(&call.function, circuit_name)),
+                    arguments: call.arguments.clone(),
+                    span: call.span.clone(),
+                });
+            }
+            _ => {}
+        }
+
+        expression.clone()
+    }
+
+    fn canonicalize_statement(&self, statement: &Statement, circuit_name: &Identifier) -> Statement {
+        // What Statements could have Self appear
+
+        match statement {
+            Statement::Return(return_statement) => {
+                return Statement::Return(ReturnStatement {
+                    expression: self.canonicalize_expression(&return_statement.expression, circuit_name),
+                    span: return_statement.span.clone(),
+                });
+            }
+            Statement::Definition(definition) => {
+                let mut type_ = definition.type_.clone();
+
+                if self.is_self_type(type_.as_ref()) {
+                    type_ = Some(Type::Circuit(circuit_name.clone()));
+                }
+
+                return Statement::Definition(DefinitionStatement {
+                    declaration_type: definition.declaration_type.clone(),
+                    variable_names: definition.variable_names.clone(),
+                    type_,
+                    value: self.canonicalize_expression(&definition.value, circuit_name),
+                    span: definition.span.clone(),
+                });
+            }
+            Statement::Expression(expression) => {
+                return Statement::Expression(ExpressionStatement {
+                    expression: self.canonicalize_expression(&expression.expression, circuit_name),
+                    span: expression.span.clone(),
+                });
+            }
+            Statement::Block(block) => {
+                return Statement::Block(Block {
+                    statements: block
+                        .statements
+                        .iter()
+                        .map(|block_statement| self.canonicalize_statement(&block_statement, circuit_name))
+                        .collect(),
+                    span: block.span.clone(),
+                });
+            }
+            _ => {}
+        }
+
+        statement.clone()
+    }
+
     fn canonicalize_circuit_member(&self, circuit_member: &CircuitMember, circuit_name: &Identifier) -> CircuitMember {
         match circuit_member {
             CircuitMember::CircuitVariable(_, _) => {}
             CircuitMember::CircuitFunction(function) => {
                 let input = function.input.clone();
                 let mut output = function.output.clone();
+                let block = Block {
+                    statements: function
+                        .block
+                        .statements
+                        .iter()
+                        .map(|statement| self.canonicalize_statement(statement, circuit_name))
+                        .collect(),
+                    span: function.block.span.clone(),
+                };
 
                 // probably shouldn't do this its self not Self
                 // if self.is_self_keyword(&input) {
@@ -109,7 +201,7 @@ impl Canonicalizer {
                     identifier: function.identifier.clone(),
                     input,
                     output,
-                    block: function.block.clone(),
+                    block,
                     span: function.span.clone(),
                 });
             }