diff --git a/justfile b/justfile
index ad237ea9..f5db7774 100644
--- a/justfile
+++ b/justfile
@@ -1,8 +1,8 @@
 set export
 
 BUILD_NAME := "change_me"
-    
-build:
+
+build: format
     cd engine/ && scons target=editor symbols=yes optimization=debug dev_build=yes linker=mold use_llvm=yes compiledb=yes custom_modules="../modules"
 
 run: build
@@ -29,3 +29,6 @@ initialize-template projectname:
     sed "s/change_me/{{projectname}}/" ./justfile
     mv ./modules/PROJECT ./modules/{{projectname}}
 
+format:
+    # Formatting Custom Modules
+    clang-format -i $(find modules/ -iname '*.h' -o -iname '*.c' -o -iname '*.hpp' -o -iname '*.cpp' -o -iname '*.hxx' -o -iname '*.cxx')