diff --git a/bench/codeman-wrapper.hpp b/bench/codeman-wrapper.hpp
index f3f807c..af6a9d8 100644
--- a/bench/codeman-wrapper.hpp
+++ b/bench/codeman-wrapper.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ChaiVM/utils/chai-file.hpp"
 #include "ChaiVM/interpreter/executor.hpp"
+#include "ChaiVM/utils/chai-file.hpp"
 #include "ChaiVM/utils/instr2Raw.hpp"
 
 using namespace chai::interpreter;
diff --git a/include/ChaiVM/utils/chai-file.hpp b/include/ChaiVM/utils/chai-file.hpp
index a37987d..eec2f18 100644
--- a/include/ChaiVM/utils/chai-file.hpp
+++ b/include/ChaiVM/utils/chai-file.hpp
@@ -17,7 +17,8 @@ class ChaiFile {
         return rawInstrs_.size() - 1;
     }
 
-    chai::interpreter::Immidiate addConst(std::unique_ptr<Constant> &&constant) {
+    chai::interpreter::Immidiate
+    addConst(std::unique_ptr<Constant> &&constant) {
         pool_.push_back(std::move(constant));
         return pool_.size() - 1;
     }
diff --git a/include/ChaiVM/utils/constant.hpp b/include/ChaiVM/utils/constant.hpp
index ead3ca1..03c143a 100644
--- a/include/ChaiVM/utils/constant.hpp
+++ b/include/ChaiVM/utils/constant.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ChaiVM/interpreter/instruction.hpp"
 #include "ChaiVM/interpreter/code-manager.hpp"
+#include "ChaiVM/interpreter/instruction.hpp"
 #include "ChaiVM/types.hpp"
 
 struct Constant {
@@ -21,7 +21,9 @@ struct ConstI64 : public Constant {
     void write(std::ofstream &ofs) override {
         ofs.write(reinterpret_cast<const char *>(&data_), sizeof(int64_t));
     }
-    int8_t getType() override { return chai::interpreter::CodeManager::CNST_I64; }
+    int8_t getType() override {
+        return chai::interpreter::CodeManager::CNST_I64;
+    }
     ~ConstI64() override = default;
 };
 
@@ -31,6 +33,8 @@ struct ConstF64 : public Constant {
     void write(std::ofstream &ofs) override {
         ofs.write(reinterpret_cast<const char *>(&data_), sizeof(double));
     }
-    int8_t getType() override { return chai::interpreter::CodeManager::CNST_F64; }
+    int8_t getType() override {
+        return chai::interpreter::CodeManager::CNST_F64;
+    }
     ~ConstF64() override = default;
 };
diff --git a/test/ChaiVM/interpreter/code-manager-test.cpp b/test/ChaiVM/interpreter/code-manager-test.cpp
index e0628ce..655cc22 100644
--- a/test/ChaiVM/interpreter/code-manager-test.cpp
+++ b/test/ChaiVM/interpreter/code-manager-test.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 
 #include "ChaiVM/interpreter/code-manager.hpp"
-#include "ChaiVM/utils/instr2Raw.hpp"
 #include "ChaiVM/utils/chai-file.hpp"
+#include "ChaiVM/utils/instr2Raw.hpp"
 
 using namespace chai::interpreter;
 using namespace chai::utils;
diff --git a/test/ChaiVM/interpreter/executor_test.cpp b/test/ChaiVM/interpreter/executor_test.cpp
index d859174..d2fa188 100644
--- a/test/ChaiVM/interpreter/executor_test.cpp
+++ b/test/ChaiVM/interpreter/executor_test.cpp
@@ -2,9 +2,9 @@
 #include <gtest/gtest.h>
 
 #include "ChaiVM/interpreter/executor.hpp"
-#include "ChaiVM/utils/instr2Raw.hpp"
 #include "ChaiVM/utils/chai-file.hpp"
 #include "ChaiVM/utils/constant.hpp"
+#include "ChaiVM/utils/instr2Raw.hpp"
 
 using namespace chai::interpreter;
 using namespace chai::utils;