diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index f176071..7665565 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -7,20 +7,20 @@ add_subdirectory(./time)
 add_subdirectory(./logger)
 add_subdirectory(./debug)
 add_subdirectory(./math)
-# 
+#
 add_subdirectory(./asset_baker)
 add_subdirectory(./assets)
-# 
+#
 add_subdirectory(./camera)
 add_subdirectory(./input)
 # add_subdirectory(./ui)
-# 
+#
 add_subdirectory(./surface)
 add_subdirectory(./renderer)
 add_subdirectory(./ecs)
-# 
+#
 add_subdirectory(./app)
 
-# apps 
+# apps
 add_subdirectory(./mirror)
 add_subdirectory(test)
diff --git a/modules/app/CMakeLists.txt b/modules/app/CMakeLists.txt
index 2f87a4b..f7636bb 100644
--- a/modules/app/CMakeLists.txt
+++ b/modules/app/CMakeLists.txt
@@ -1,2 +1,5 @@
 add_library_module(app application.cpp)
-target_link_libraries(app PUBLIC memory PRIVATE lt_debug)
+target_link_libraries(
+    app
+    PUBLIC memory
+    PRIVATE lt_debug)
diff --git a/modules/asset_baker/CMakeLists.txt b/modules/asset_baker/CMakeLists.txt
index 7880d07..d67142d 100644
--- a/modules/asset_baker/CMakeLists.txt
+++ b/modules/asset_baker/CMakeLists.txt
@@ -1,18 +1,6 @@
-add_library_module(libasset_baker
-    bakers.cpp
-)
-target_link_libraries(libasset_baker
-PUBLIC
-    assets
-    logger
-    lt_debug
-    tbb
-)
-add_test_module(libasset_baker 
-    bakers.test.cpp
-)
+add_library_module(libasset_baker bakers.cpp)
+target_link_libraries(libasset_baker PUBLIC assets logger lt_debug tbb)
+add_test_module(libasset_baker bakers.test.cpp)
 
-add_executable_module(asset_baker
-    entrypoint/baker.cpp
-)
+add_executable_module(asset_baker entrypoint/baker.cpp)
 target_link_libraries(asset_baker PRIVATE libasset_baker)
diff --git a/modules/assets/CMakeLists.txt b/modules/assets/CMakeLists.txt
index 4659ea3..dfd002f 100644
--- a/modules/assets/CMakeLists.txt
+++ b/modules/assets/CMakeLists.txt
@@ -1,14 +1,5 @@
-add_library_module(assets 
-    shader.cpp
-)
+add_library_module(assets shader.cpp)
 
-target_link_libraries(
-assets 
-PUBLIC
-logger 
-lt_debug
-)
+target_link_libraries(assets PUBLIC logger lt_debug)
 
-add_test_module(assets
-    shader.test.cpp
-)
+add_test_module(assets shader.test.cpp)
diff --git a/modules/debug/CMakeLists.txt b/modules/debug/CMakeLists.txt
index 5d56470..69a5396 100644
--- a/modules/debug/CMakeLists.txt
+++ b/modules/debug/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_library_module(lt_debug instrumentor.cpp)
 target_link_libraries(lt_debug PUBLIC logger)
-target_precompile_headers(lt_debug PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/private/pch.hpp)
+target_precompile_headers(lt_debug PUBLIC
+                          ${CMAKE_CURRENT_SOURCE_DIR}/private/pch.hpp)
diff --git a/modules/mirror/CMakeLists.txt b/modules/mirror/CMakeLists.txt
index 5a526a5..4934d14 100644
--- a/modules/mirror/CMakeLists.txt
+++ b/modules/mirror/CMakeLists.txt
@@ -1,21 +1,9 @@
-add_library_module(libmirror 
-)
-target_link_libraries(
-  libmirror
-  INTERFACE
-  app
-  time
-  input 
-  surface
-  renderer
-)
+add_library_module(libmirror)
+target_link_libraries(libmirror INTERFACE app time input surface renderer)
 
-add_test_module(libmirror 
-    layers/editor_layer.test.cpp
-    panels/asset_browser.test.cpp
-    panels/properties.test.cpp
-    panels/scene_hierarchy.test.cpp
-)
+add_test_module(
+    libmirror layers/editor_layer.test.cpp panels/asset_browser.test.cpp
+    panels/properties.test.cpp panels/scene_hierarchy.test.cpp)
 
 add_executable_module(mirror entrypoint/mirror.cpp)
 target_link_libraries(mirror PRIVATE libmirror input)
diff --git a/modules/renderer/CMakeLists.txt b/modules/renderer/CMakeLists.txt
index 5ef45e9..5226447 100644
--- a/modules/renderer/CMakeLists.txt
+++ b/modules/renderer/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_library_module(renderer
+add_library_module(
+    renderer
     system.cpp
-
     # Vulkan - backend
     backend/vk/messenger.cpp
     backend/vk/context/device.cpp
@@ -18,27 +18,17 @@ add_library_module(renderer
     frontend/context/surface.cpp
     frontend/context/swapchain.cpp
     frontend/renderer/renderer.cpp
-    frontend/renderer/pass.cpp
-)
+    frontend/renderer/pass.cpp)
 
-target_link_libraries(renderer
-PUBLIC 
-    app 
-    ecs
-    memory
-    assets
-    time
-    bitwise
-PRIVATE
-    surface
-    pthread
-)
+target_link_libraries(
+    renderer
+    PUBLIC app ecs memory assets time bitwise
+    PRIVATE surface pthread)
 
-add_test_module(renderer 
+add_test_module(
+    renderer
     test/utils.cpp
-
     system.test.cpp
-
     # general backend tests through the frontend
     frontend/messenger.test.cpp
     frontend/context/surface.test.cpp
@@ -46,17 +36,9 @@ add_test_module(renderer
     frontend/context/swapchain.test.cpp
     frontend/renderer/pass.test.cpp
     frontend/renderer/renderer.test.cpp
-
     # backend specific tests -- vk
     backend/vk/context/instance.test.cpp
-
-    # backend specific tests -- dx
-
-    # backend specific tests -- mt
-) 
-
-target_link_libraries(renderer_tests
-PRIVATE
-    surface
-    pthread
+    # backend specific tests -- dx backend specific tests -- mt
 )
+
+target_link_libraries(renderer_tests PRIVATE surface pthread)
diff --git a/modules/std/CMakeLists.txt b/modules/std/CMakeLists.txt
index 12e155d..7e84fdc 100644
--- a/modules/std/CMakeLists.txt
+++ b/modules/std/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_library(std INTERFACE)
-target_precompile_headers(std INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/public/pch.hpp)
+target_precompile_headers(std INTERFACE
+                          ${CMAKE_CURRENT_SOURCE_DIR}/public/pch.hpp)
diff --git a/modules/surface/CMakeLists.txt b/modules/surface/CMakeLists.txt
index 3bf9473..af5c54d 100644
--- a/modules/surface/CMakeLists.txt
+++ b/modules/surface/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT WIN32)
+if(NOT WIN32)
     add_library_module(surface linux/system.cpp)
     target_link_libraries(surface PRIVATE X11)
 
@@ -7,17 +7,10 @@ else(WIN32)
 
 endif()
 
-target_link_libraries(surface PUBLIC 
-    ecs
-    app
-    math
-    memory
-    tbb
-    PRIVATE
-    logger 
-    lt_debug
-    time
-)
+target_link_libraries(
+    surface
+    PUBLIC ecs app math memory tbb
+    PRIVATE logger lt_debug time)
 
 add_test_module(surface system.test.cpp)
 add_fuzz_module(surface system.fuzz.cpp)
diff --git a/modules/time/CMakeLists.txt b/modules/time/CMakeLists.txt
index 3b391ba..dacb550 100644
--- a/modules/time/CMakeLists.txt
+++ b/modules/time/CMakeLists.txt
@@ -1,4 +1,3 @@
 add_library_module(time timer.cpp)
 target_link_libraries(time PUBLIC tbb)
 add_test_module(time timer.test.cpp)
-