diff --git a/CMakeLists.txt b/CMakeLists.txt
index d12bed19..65649bde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@
 #
 # Authors: 
 #    Thomas Psota
+#    Lukas Steiner
 
 ###############################################
 ###                 DRAMSys                 ###
@@ -110,9 +111,9 @@ add_subdirectory(${DRAMSYS_LIBRARY_DIR}/sqlite3)
 ### GoogleTest ###
 if(DRAMSYS_BUILD_TESTS)
     FetchContent_Declare(
-	    googletest
-	    GIT_REPOSITORY https://github.com/google/googletest
-		GIT_TAG release-1.12.1)
+        googletest
+        GIT_REPOSITORY https://github.com/google/googletest
+        GIT_TAG release-1.12.1)
 
     # For Windows: Prevent overriding the parent project's compiler/linker settings
     set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
@@ -123,23 +124,12 @@ if(DRAMSYS_BUILD_TESTS)
     set_target_properties(gtest_main PROPERTIES FOLDER lib/gtest)
 endif()
 
-### sqlite-amalgamation ###
-#  FetchContent_Declare(
-#  	sqlite-amalgamation
-#  	GIT_REPOSITORY https://github.com/azadkuh/sqlite-amalgamation.git
-#  	GIT_TAG 3.38.2)
-#  
-#  set(SQLITE_ENABLE_RTREE ON CACHE BOOL "Enable R-Tree Feature")
-#  FetchContent_MakeAvailable(sqlite-amalgamation)
-#  set_target_properties(SQLite3 PROPERTIES FOLDER lib)
-#  add_library(sqlite::sqlite3 ALIAS SQLite3)
-
 ### SystemC ###
 list(APPEND CMAKE_PREFIX_PATH $ENV{SYSTEMC_HOME} /opt/systemc/)
 FetchContent_Declare(
-	systemc
-	GIT_REPOSITORY https://github.com/accellera-official/systemc.git
-	GIT_TAG 2.3.4
+    systemc
+    GIT_REPOSITORY https://github.com/accellera-official/systemc.git
+    GIT_TAG 2.3.4
     FIND_PACKAGE_ARGS NAMES SystemCLanguage)
 
 set(DISABLE_COPYRIGHT_MESSAGE True)
@@ -165,7 +155,7 @@ add_subdirectory(src/configuration)
 add_subdirectory(src/libdramsys)
 
 if(DRAMSYS_BUILD_CLI)
-	add_subdirectory(src/simulator)
+    add_subdirectory(src/simulator)
 endif()
 
 if(DRAMSYS_ENABLE_EXTENSIONS)
@@ -177,7 +167,7 @@ endif()
 ###############################################
 
 if(DRAMSYS_BUILD_TESTS)
-    include( GoogleTest )
-    include( CTest )
+    include(GoogleTest)
+    include(CTest)
     add_subdirectory(tests)
 endif()
diff --git a/extensions/apps/CMakeLists.txt b/extensions/apps/CMakeLists.txt
index 595ef6e5..a9621e34 100644
--- a/extensions/apps/CMakeLists.txt
+++ b/extensions/apps/CMakeLists.txt
@@ -12,6 +12,6 @@
 
 option(DRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE "Enable DRAMSys Trace Analyzer" ON)
 if(DRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE)
-	message(STATUS " * Trace Analyzer")
-	add_subdirectory(traceAnalyzer)
+    message(STATUS " * Trace Analyzer")
+    add_subdirectory(traceAnalyzer)
 endif()
diff --git a/extensions/apps/traceAnalyzer/CMakeLists.txt b/extensions/apps/traceAnalyzer/CMakeLists.txt
index de93f5c9..82cd3c90 100644
--- a/extensions/apps/traceAnalyzer/CMakeLists.txt
+++ b/extensions/apps/traceAnalyzer/CMakeLists.txt
@@ -95,8 +95,8 @@ target_link_libraries(TraceAnalyzer
 set(DRAMSYS_TRACEANALYZER_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
 target_compile_definitions(${PROJECT_NAME} 
-	PUBLIC 
-		DRAMSYS_TRACEANALYZER_DIR="${DRAMSYS_TRACEANALYZER_DIR}"
+    PUBLIC 
+        DRAMSYS_TRACEANALYZER_DIR="${DRAMSYS_TRACEANALYZER_DIR}"
 )
 
 build_source_group()
diff --git a/extensions/apps/traceAnalyzer/scripts/metrics.py b/extensions/apps/traceAnalyzer/scripts/metrics.py
index d712e385..23581e9e 100644
--- a/extensions/apps/traceAnalyzer/scripts/metrics.py
+++ b/extensions/apps/traceAnalyzer/scripts/metrics.py
@@ -367,8 +367,8 @@ def delayed_reasons(connection):
             dataStrobesInOrder b
          WHERE 
             a.RowNum = b.RowNum - 1 AND
-         	b.Begin > a.End AND
-        	a.ID NOT IN (SELECT ID FROM idleGaps);
+            b.Begin > a.End AND
+            a.ID NOT IN (SELECT ID FROM idleGaps);
     """
     cursor.execute(query)
 
@@ -412,7 +412,7 @@ def delayed_reasons(connection):
                 p.PhaseName = 'ACT'
             GROUP BY 
                 d.gapBeginID
-        )	
+        )
     """
     cursor.execute(query)
     RRM = cursor.fetchone()[0]
@@ -431,7 +431,7 @@ def delayed_reasons(connection):
                 p.Transact = d.gapEndID AND
                 p.PhaseName = 'ACT'
             GROUP BY 
-                d.gapBeginID	
+                d.gapBeginID
         )
     """
     cursor.execute(query)
diff --git a/extensions/standards/CMakeLists.txt b/extensions/standards/CMakeLists.txt
index 86694d5b..5dc3a76b 100644
--- a/extensions/standards/CMakeLists.txt
+++ b/extensions/standards/CMakeLists.txt
@@ -3,7 +3,7 @@ file(GLOB sub_dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_D
 message(STATUS " Standards:")
 
 FOREACH(sub_dir ${sub_dirs})
-	IF(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${sub_dir}")
-		add_subdirectory(${sub_dir})
-	ENDIF()
+    IF(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${sub_dir}")
+        add_subdirectory(${sub_dir})
+    ENDIF()
 ENDFOREACH()
\ No newline at end of file
diff --git a/extensions/standards/DDR5/CMakeLists.txt b/extensions/standards/DDR5/CMakeLists.txt
index f537c8ac..f4c991fe 100644
--- a/extensions/standards/DDR5/CMakeLists.txt
+++ b/extensions/standards/DDR5/CMakeLists.txt
@@ -1,14 +1,14 @@
 option(DRAMSYS_EXTENSION_DDR5_ENABLE "Enable DRAMSys DDR5 Support" ON)
 
 if(DRAMSYS_EXTENSION_DDR5_ENABLE)
-	message(STATUS " * DDR5")
+    message(STATUS " * DDR5")
 
-	file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
-	file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+    file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+    file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
 
-	target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
-	target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	target_compile_definitions(DRAMSys_libdramsys PUBLIC DDR5_SIM)
+    target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
+    target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+    target_compile_definitions(DRAMSys_libdramsys PUBLIC DDR5_SIM)
 
-	build_source_group()
+    build_source_group()
 endif()
diff --git a/extensions/standards/HBM3/CMakeLists.txt b/extensions/standards/HBM3/CMakeLists.txt
index 46de65f7..d3c30441 100644
--- a/extensions/standards/HBM3/CMakeLists.txt
+++ b/extensions/standards/HBM3/CMakeLists.txt
@@ -1,14 +1,14 @@
 option(DRAMSYS_EXTENSION_HBM3_ENABLE "Enable DRAMSys HBM3 Support" ON)
 
 if(DRAMSYS_EXTENSION_HBM3_ENABLE)
-	message(STATUS " * HBM3")
+    message(STATUS " * HBM3")
 
-	file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
-	file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+    file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+    file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
 
-	target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
-	target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	target_compile_definitions(DRAMSys_libdramsys PUBLIC HBM3_SIM)
+    target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
+    target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+    target_compile_definitions(DRAMSys_libdramsys PUBLIC HBM3_SIM)
 
-	build_source_group()
+    build_source_group()
 endif()
\ No newline at end of file
diff --git a/extensions/standards/LPDDR5/CMakeLists.txt b/extensions/standards/LPDDR5/CMakeLists.txt
index fae4a84f..99f447ff 100644
--- a/extensions/standards/LPDDR5/CMakeLists.txt
+++ b/extensions/standards/LPDDR5/CMakeLists.txt
@@ -1,14 +1,14 @@
 option(DRAMSYS_EXTENSION_LPDDR5_ENABLE "Enable DRAMSys LPDDR5 Support" ON)
 
 if(DRAMSYS_EXTENSION_LPDDR5_ENABLE)
-	message(STATUS " * LPDDR5")
+    message(STATUS " * LPDDR5")
 
-	file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
-	file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
+    file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+    file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
 
-	target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
-	target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-	target_compile_definitions(DRAMSys_libdramsys PUBLIC LPDDR5_SIM)
+    target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
+    target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+    target_compile_definitions(DRAMSys_libdramsys PUBLIC LPDDR5_SIM)
 
-	build_source_group()
+    build_source_group()
 endif()
\ No newline at end of file
diff --git a/lib/sqlite3/CMakeLists.txt b/lib/sqlite3/CMakeLists.txt
index 7aed6b6f..aa826f33 100644
--- a/lib/sqlite3/CMakeLists.txt
+++ b/lib/sqlite3/CMakeLists.txt
@@ -7,7 +7,7 @@ project(sqlite3 VERSION 3.40.1)
 
 FetchContent_Declare(sqlite3 URL "https://www.sqlite.org/2022/sqlite-amalgamation-3400100.zip")
 if (NOT sqlite3_POPULATED)
-	FetchContent_Populate(sqlite3)
+    FetchContent_Populate(sqlite3)
 endif()
 
 add_library(${PROJECT_NAME})
diff --git a/src/configuration/CMakeLists.txt b/src/configuration/CMakeLists.txt
index 6ee65c9c..8d875e41 100644
--- a/src/configuration/CMakeLists.txt
+++ b/src/configuration/CMakeLists.txt
@@ -46,13 +46,13 @@ add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(${PROJECT_NAME} 
-	PUBLIC 
-		DRAMSys::util
+    PUBLIC 
+        DRAMSys::util
 )
 
 target_compile_definitions(${PROJECT_NAME} 
-	PUBLIC 
-		DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
+    PUBLIC 
+        DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
 )
 
 add_library(DRAMSys::config ALIAS ${PROJECT_NAME})
diff --git a/src/libdramsys/CMakeLists.txt b/src/libdramsys/CMakeLists.txt
index 8a13b925..f7ad7214 100644
--- a/src/libdramsys/CMakeLists.txt
+++ b/src/libdramsys/CMakeLists.txt
@@ -46,16 +46,16 @@ add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(${PROJECT_NAME} 
-	PUBLIC 
-		SystemC::systemc
-		DRAMSys::util
-		DRAMSys::config
-		sqlite3::sqlite3
+    PUBLIC 
+        SystemC::systemc
+        DRAMSys::util
+        DRAMSys::config
+        sqlite3::sqlite3
 )
 
 if (DRAMSYS_WITH_DRAMPOWER)
-	target_link_libraries(${PROJECT_NAME} PRIVATE DRAMPower)
-	target_compile_definitions(${PROJECT_NAME} PRIVATE DRAMPOWER)
+    target_link_libraries(${PROJECT_NAME} PRIVATE DRAMPower)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE DRAMPOWER)
 endif ()
 
 add_library(DRAMSys::libdramsys ALIAS ${PROJECT_NAME})
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index e1090495..6fed3aa0 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -46,13 +46,13 @@ add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(${PROJECT_NAME} 
-	PUBLIC 
-		nlohmann_json::nlohmann_json
+    PUBLIC 
+        nlohmann_json::nlohmann_json
 )
 
 target_compile_definitions(${PROJECT_NAME} 
-	PUBLIC 
-		DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
+    PUBLIC 
+        DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
 )
 
 add_library(DRAMSys::util ALIAS ${PROJECT_NAME})
diff --git a/tests/tests_configuration/CMakeLists.txt b/tests/tests_configuration/CMakeLists.txt
index baab76cc..cf0d7e06 100644
--- a/tests/tests_configuration/CMakeLists.txt
+++ b/tests/tests_configuration/CMakeLists.txt
@@ -11,12 +11,12 @@ add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/test_configuration.cp
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests/configuration)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
-	DRAMSys::config
-	gtest_main
+    DRAMSys::config
+    gtest_main
 )
 
 gtest_discover_tests(${PROJECT_NAME}
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 add_executable(jsonconverter ${CMAKE_CURRENT_SOURCE_DIR}/jsonconverter.cpp)
diff --git a/tests/tests_dramsys/CMakeLists.txt b/tests/tests_dramsys/CMakeLists.txt
index c14f51c4..8c8d48aa 100644
--- a/tests/tests_dramsys/CMakeLists.txt
+++ b/tests/tests_dramsys/CMakeLists.txt
@@ -14,13 +14,13 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR})
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests)
 target_link_libraries(${PROJECT_NAME} 
-	DRAMSys::util
-	DRAMSys::libdramsys
-	gtest_main
+    DRAMSys::util
+    DRAMSys::libdramsys
+    gtest_main
 )
 
 gtest_discover_tests(${PROJECT_NAME}
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 build_source_group()
diff --git a/tests/tests_dramsys/test_misc.cpp b/tests/tests_dramsys/test_misc.cpp
index 165a3197..dcadee20 100644
--- a/tests/tests_dramsys/test_misc.cpp
+++ b/tests/tests_dramsys/test_misc.cpp
@@ -2,13 +2,13 @@
 
 class MiscTest : public ::testing::Test {
 protected:
-	virtual void SetUp()
-	{
-	}
+    virtual void SetUp()
+    {
+    }
 
-	virtual void TearDown()
-	{
-	}
+    virtual void TearDown()
+    {
+    }
 };
 
 TEST_F(MiscTest, Test)
diff --git a/tests/tests_simulator/CMakeLists.txt b/tests/tests_simulator/CMakeLists.txt
index 0383d14b..03f5e401 100644
--- a/tests/tests_simulator/CMakeLists.txt
+++ b/tests/tests_simulator/CMakeLists.txt
@@ -17,11 +17,11 @@ set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests/simulator)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
     DRAMSys_Simulator
-	gtest_main
+    gtest_main
 )
 
 gtest_discover_tests(${PROJECT_NAME}
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 build_source_group()
diff --git a/tests/tests_util/CMakeLists.txt b/tests/tests_util/CMakeLists.txt
index 24ec5e66..65542c88 100644
--- a/tests/tests_util/CMakeLists.txt
+++ b/tests/tests_util/CMakeLists.txt
@@ -14,8 +14,8 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR})
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests)
 target_link_libraries(${PROJECT_NAME} 
-	DRAMSys::util
-	gtest_main
+    DRAMSys::util
+    gtest_main
 )
 
 gtest_discover_tests(${PROJECT_NAME})
diff --git a/tests/tests_util/test_json.cpp b/tests/tests_util/test_json.cpp
index 0e3d472a..ee0d9e0d 100644
--- a/tests/tests_util/test_json.cpp
+++ b/tests/tests_util/test_json.cpp
@@ -4,35 +4,35 @@
 
 class JsonTest : public ::testing::Test {
 protected:
-	virtual void SetUp()
-	{
-	}
+    virtual void SetUp()
+    {
+    }
 
-	virtual void TearDown()
-	{
-	}
+    virtual void TearDown()
+    {
+    }
 };
 
 TEST_F(JsonTest, Test)
 {
-	auto in = json_t::parse(R"( 
-	{ 
-		"test": 5,
-		"null": null
-	} 
+    auto in = json_t::parse(R"( 
+    { 
+        "test": 5,
+        "null": null
+    } 
 )");
 
-	std::optional<int> opt_in;
-	std::optional<int> opt_null;
-	std::optional<int> opt_nil;
+    std::optional<int> opt_in;
+    std::optional<int> opt_null;
+    std::optional<int> opt_nil;
 
-	in["test"].get_to(opt_in);
-	in["null"].get_to(opt_null);
-	in["nil"].get_to(opt_nil);
-	
-	ASSERT_TRUE(opt_in.has_value());
-	ASSERT_EQ(*opt_in, 5);
-	
-	ASSERT_FALSE(opt_null.has_value());
-	ASSERT_FALSE(opt_nil.has_value());
+    in["test"].get_to(opt_in);
+    in["null"].get_to(opt_null);
+    in["nil"].get_to(opt_nil);
+    
+    ASSERT_TRUE(opt_in.has_value());
+    ASSERT_EQ(*opt_in, 5);
+    
+    ASSERT_FALSE(opt_null.has_value());
+    ASSERT_FALSE(opt_nil.has_value());
 };