diff --git a/include/engine/data_watchdog.hpp b/include/engine/data_watchdog.hpp
index 228cfec6c8c..b44274545bb 100644
--- a/include/engine/data_watchdog.hpp
+++ b/include/engine/data_watchdog.hpp
@@ -59,7 +59,8 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
             facade_factory =
                 DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>(
                     std::make_shared<datafacade::SharedMemoryAllocator>(
-                        std::vector<storage::SharedRegionRegister::ShmKey> {static_region.shm_key, updatable_region.shm_key}));
+                        std::vector<storage::SharedRegionRegister::ShmKey>{
+                            static_region.shm_key, updatable_region.shm_key}));
         }
 
         watcher = std::thread(&DataWatchdogImpl::Run, this);
@@ -113,7 +114,8 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
             facade_factory =
                 DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>(
                     std::make_shared<datafacade::SharedMemoryAllocator>(
-                        std::vector<storage::SharedRegionRegister::ShmKey>{static_region.shm_key, updatable_region.shm_key}));
+                        std::vector<storage::SharedRegionRegister::ShmKey>{
+                            static_region.shm_key, updatable_region.shm_key}));
         }
 
         util::Log() << "DataWatchdog thread stopped";
diff --git a/include/engine/datafacade/shared_memory_allocator.hpp b/include/engine/datafacade/shared_memory_allocator.hpp
index 23b2c3ace54..00b37ac7fd5 100644
--- a/include/engine/datafacade/shared_memory_allocator.hpp
+++ b/include/engine/datafacade/shared_memory_allocator.hpp
@@ -23,7 +23,8 @@ namespace datafacade
 class SharedMemoryAllocator : public ContiguousBlockAllocator
 {
   public:
-    explicit SharedMemoryAllocator(const std::vector<storage::SharedRegionRegister::ShmKey> &shm_keys);
+    explicit SharedMemoryAllocator(
+        const std::vector<storage::SharedRegionRegister::ShmKey> &shm_keys);
     ~SharedMemoryAllocator() override final;
 
     // interface to give access to the datafacades
diff --git a/include/storage/storage.hpp b/include/storage/storage.hpp
index c8add348c6c..2c8ae02bc61 100644
--- a/include/storage/storage.hpp
+++ b/include/storage/storage.hpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef STORAGE_HPP
 #define STORAGE_HPP
 
-#include "storage/shared_datatype.hpp"
 #include "storage/shared_data_index.hpp"
+#include "storage/shared_datatype.hpp"
 #include "storage/storage_config.hpp"
 
 #include <boost/filesystem/path.hpp>
diff --git a/include/storage/view_factory.hpp b/include/storage/view_factory.hpp
index 2230c1bb0f2..cf6839a050a 100644
--- a/include/storage/view_factory.hpp
+++ b/include/storage/view_factory.hpp
@@ -50,8 +50,9 @@ util::vector_view<T> make_vector_view(const SharedDataIndex &index, const std::s
     return util::vector_view<T>(index.GetBlockPtr<T>(name), index.GetBlockEntries(name));
 }
 
-template<>
-inline util::vector_view<bool> make_vector_view(const SharedDataIndex &index, const std::string &name)
+template <>
+inline util::vector_view<bool> make_vector_view(const SharedDataIndex &index,
+                                                const std::string &name)
 {
     return util::vector_view<bool>(index.GetBlockPtr<util::vector_view<bool>::Word>(name),
                                    index.GetBlockEntries(name));