diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e38afb73f469cd17a60e4a4899b0e909a3f39dd..8ef44a71056405d70fdf6f76028a576c234966d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,8 @@ project(
   ScenarioAPI
   VERSION 0.1.0
   DESCRIPTION "Scenario API, an abstraction layer for environmental simulators"
-  LANGUAGES CXX)
+  LANGUAGES CXX
+)
 
 # Project setup only if this is the main project
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
@@ -30,8 +31,7 @@ endif()
 add_subdirectory(MantleAPI)
 
 # Should we build documentation for the project?
-if((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_DOCUMENTATION)
-   OR ScenarioAPI_BUILD_DOCUMENTATION)
+if((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_DOCUMENTATION) OR ScenarioAPI_BUILD_DOCUMENTATION)
   add_subdirectory(doc)
 endif()
 
diff --git a/MantleAPI/include/CMakeLists.txt b/MantleAPI/include/CMakeLists.txt
index 70654a03b3484c8ae140d7bab97672e80c0d260e..9cf7e8d35e292b56a5c68d62a3d7ecab79dcdaa9 100644
--- a/MantleAPI/include/CMakeLists.txt
+++ b/MantleAPI/include/CMakeLists.txt
@@ -8,15 +8,22 @@
 # SPDX-License-Identifier: EPL-2.0
 ################################################################################
 
-find_package(units CONFIG REQUIRED)
+find_package(
+  units CONFIG REQUIRED
+)
 
 file(
   GLOB_RECURSE HEADERS
   RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  CONFIGURE_DEPENDS "*.h")
+  CONFIGURE_DEPENDS "*.h"
+)
 
-add_library(ScenarioAPI INTERFACE)
-add_library(ScenarioAPI::ScenarioAPI ALIAS ScenarioAPI)
+add_library(
+  ScenarioAPI INTERFACE
+)
+add_library(
+  ScenarioAPI::ScenarioAPI ALIAS ScenarioAPI
+)
 
 target_link_libraries(ScenarioAPI INTERFACE units)
 
@@ -24,21 +31,24 @@ include(GNUInstallDirs)
 set(INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/ScenarioAPI")
 
 target_include_directories(
-  ScenarioAPI INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+  ScenarioAPI
+  INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
 
 target_compile_features(ScenarioAPI INTERFACE cxx_std_17)
 
 include(CMakePackageConfigHelpers)
 configure_package_config_file(
-  "${PROJECT_SOURCE_DIR}/cmake/ScenarioAPIConfig.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/ScenarioAPIConfig.cmake"
+  "${PROJECT_SOURCE_DIR}/cmake/ScenarioAPIConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ScenarioAPIConfig.cmake"
   INSTALL_DESTINATION ${INSTALL_CONFIG_DIR}
-  PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
+  PATH_VARS CMAKE_INSTALL_INCLUDEDIR
+)
 
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/ScenarioAPIConfigVersion.cmake"
   VERSION ${PROJECT_VERSION}
-  COMPATIBILITY SameMajorVersion)
+  COMPATIBILITY SameMajorVersion
+)
 
 install(DIRECTORY MantleAPI TYPE INCLUDE)
 install(TARGETS ScenarioAPI EXPORT ScenarioAPITargets)
@@ -46,10 +56,12 @@ install(TARGETS ScenarioAPI EXPORT ScenarioAPITargets)
 install(
   EXPORT ScenarioAPITargets
   DESTINATION ${INSTALL_CONFIG_DIR}
-  NAMESPACE ScenarioAPI::)
+  NAMESPACE ScenarioAPI::
+)
 
 install(
   FILES "${CMAKE_CURRENT_BINARY_DIR}/ScenarioAPIConfig.cmake"
         "${CMAKE_CURRENT_BINARY_DIR}/ScenarioAPIConfigVersion.cmake"
   DESTINATION ${INSTALL_CONFIG_DIR}
-  COMPONENT dev)
+  COMPONENT dev
+)