diff --git a/src/sequence_diagram/model/diagram.cc b/src/sequence_diagram/model/diagram.cc
index decb8db2..99091e9d 100644
--- a/src/sequence_diagram/model/diagram.cc
+++ b/src/sequence_diagram/model/diagram.cc
@@ -288,7 +288,7 @@ void diagram::print() const
 
             if (participants_.find(message.to()) == participants_.end()) {
                 LOG_TRACE("       Message from={}, from_id={}, "
-                        "to={}, to_id={}, name={}, type={}",
+                          "to={}, to_id={}, name={}, type={}",
                     from_participant.full_name(false), from_participant.id(),
                     "__UNRESOLVABLE_ID__", message.to(), message.message_name(),
                     to_string(message.type()));
@@ -297,7 +297,7 @@ void diagram::print() const
                 const auto &to_participant = *participants_.at(message.to());
 
                 LOG_TRACE("       Message from={}, from_id={}, "
-                        "to={}, to_id={}, name={}, type={}",
+                          "to={}, to_id={}, name={}, type={}",
                     from_participant.full_name(false), from_participant.id(),
                     to_participant.full_name(false), to_participant.id(),
                     message.message_name(), to_string(message.type()));
diff --git a/src/sequence_diagram/model/diagram.h b/src/sequence_diagram/model/diagram.h
index 51d51976..2b530f49 100644
--- a/src/sequence_diagram/model/diagram.h
+++ b/src/sequence_diagram/model/diagram.h
@@ -78,7 +78,7 @@ public:
 
     void add_active_participant(common::model::diagram_element::id_t id);
 
-    activity& get_activity(common::model::diagram_element::id_t id);
+    activity &get_activity(common::model::diagram_element::id_t id);
 
     void add_if_stmt(common::model::diagram_element::id_t current_caller_id,
         common::model::message_t type);
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index a933042b..79f7eaf0 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -336,8 +336,8 @@ bool translation_unit_visitor::VisitCXXMethodDecl(clang::CXXMethodDecl *m)
 
     set_unique_id(m->getID(), m_ptr->id()); // This is probably not necessary?
 
-    LOG_TRACE("Set id {} --> {} for method name {} [{}]", m->getID(), m_ptr->id(),
-        method_full_name, m->isThisDeclarationADefinition());
+    LOG_TRACE("Set id {} --> {} for method name {} [{}]", m->getID(),
+        m_ptr->id(), method_full_name, m->isThisDeclarationADefinition());
 
     context().update(m);
 
diff --git a/src/util/util.cc b/src/util/util.cc
index 4801f877..bda4497b 100644
--- a/src/util/util.cc
+++ b/src/util/util.cc
@@ -36,10 +36,10 @@ void setup_logging(int verbose)
     if (verbose == 0) {
         console->set_level(spdlog::level::err);
     }
-    else if(verbose == 1) {
+    else if (verbose == 1) {
         console->set_level(spdlog::level::info);
     }
-    else if(verbose == 2) {
+    else if (verbose == 2) {
         console->set_level(spdlog::level::debug);
     }
     else {
diff --git a/tests/test_cases.h b/tests/test_cases.h
index 276a534d..1bfe9dd8 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -82,19 +82,26 @@ template <typename T, typename... Ts> constexpr bool has_type() noexcept
     return (std::is_same_v<T, Ts> || ... || false);
 }
 
-struct Public { };
+struct Public {
+};
 
-struct Protected { };
+struct Protected {
+};
 
-struct Private { };
+struct Private {
+};
 
-struct Abstract { };
+struct Abstract {
+};
 
-struct Static { };
+struct Static {
+};
 
-struct Const { };
+struct Const {
+};
 
-struct Default { };
+struct Default {
+};
 
 struct HasCallWithResultMatcher : ContainsMatcher {
     HasCallWithResultMatcher(