diff --git a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
index 6c7a736e..4618deae 100644
--- a/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
+++ b/src/sequence_diagram/generators/plantuml/sequence_diagram_generator.cc
@@ -113,7 +113,7 @@ void generator::generate_participants(std::ostream &ostr) const
         ostr << "participant \""
              << m_config.using_namespace().relative(
                     participant.full_name(false))
-             << "\" as " << participant.alias()<< '\n';
+             << "\" as " << participant.alias() << '\n';
     }
 }
 
diff --git a/src/sequence_diagram/model/diagram.cc b/src/sequence_diagram/model/diagram.cc
index 722685f6..e919938a 100644
--- a/src/sequence_diagram/model/diagram.cc
+++ b/src/sequence_diagram/model/diagram.cc
@@ -29,10 +29,10 @@ common::model::diagram_t diagram::type() const
 }
 
 common::optional_ref<common::model::diagram_element> diagram::get(
-    const std::string & full_name) const
+    const std::string &full_name) const
 {
-    for(const auto& [id, participant] : participants) {
-        if(participant->full_name(false) == full_name)
+    for (const auto &[id, participant] : participants) {
+        if (participant->full_name(false) == full_name)
             return {*participant};
     }
 
@@ -42,7 +42,7 @@ common::optional_ref<common::model::diagram_element> diagram::get(
 common::optional_ref<common::model::diagram_element> diagram::get(
     const common::model::diagram_element::id_t id) const
 {
-    if(participants.find(id) != participants.end())
+    if (participants.find(id) != participants.end())
         return {*participants.at(id)};
 
     return {};
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index 29f4fdd5..a277888d 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -433,9 +433,10 @@ bool translation_unit_visitor::VisitCallExpr(clang::CallExpr *expr)
                 set_ast_local_id(callee_function->getID(), f_ptr->id());
                 diagram().add_participant(std::move(f_ptr));
 
-                // This is not optimal way to check whether the callee declaration
-                // is implicit or explicit (we don't want implicit declarations
-                // as separate participants), but is there a better way?
+                // This is not optimal way to check whether the callee
+                // declaration is implicit or explicit (we don't want implicit
+                // declarations as separate participants), but is there a better
+                // way?
                 is_implicit = true;
             }
 
diff --git a/tests/t20004/t20004.cc b/tests/t20004/t20004.cc
index 2942e101..097c43a7 100644
--- a/tests/t20004/t20004.cc
+++ b/tests/t20004/t20004.cc
@@ -9,10 +9,8 @@ template <typename T> T m2(T p) { return m3<T>(p); }
 
 template <typename T> T m1(T p) { return m2<T>(p); }
 
-template<> [[maybe_unused]] int m4<int>(int p) { return p+2; }
+template <> [[maybe_unused]] int m4<int>(int p) { return p + 2; }
 
-int main() {
-    return m1<int>(0);
-}
+int main() { return m1<int>(0); }
 }
 }
diff --git a/tests/test_cases.h b/tests/test_cases.h
index 4d6ec4be..90302891 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -122,18 +122,16 @@ struct HasCallWithResultMatcher : ContainsMatcher {
 ContainsMatcher HasCall(std::string const &from, std::string const &message,
     CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
 {
-    return ContainsMatcher(
-        CasedString(fmt::format("{} -> {} : {}()", from, from, message),
-            caseSensitivity));
+    return ContainsMatcher(CasedString(
+        fmt::format("{} -> {} : {}()", from, from, message), caseSensitivity));
 }
 
 ContainsMatcher HasCall(std::string const &from, std::string const &to,
     std::string const &message,
     CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
 {
-    return ContainsMatcher(
-        CasedString(fmt::format("{} -> {} : {}()", from, to, message),
-            caseSensitivity));
+    return ContainsMatcher(CasedString(
+        fmt::format("{} -> {} : {}()", from, to, message), caseSensitivity));
 }
 
 auto HasCallWithResponse(std::string const &from, std::string const &to,
@@ -141,10 +139,9 @@ auto HasCallWithResponse(std::string const &from, std::string const &to,
     CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes)
 {
     return HasCallWithResultMatcher(
-        CasedString(fmt::format("{} -> {} : {}()", from, to, message),
-            caseSensitivity),
         CasedString(
-            fmt::format("{} --> {}", to, from), caseSensitivity));
+            fmt::format("{} -> {} : {}()", from, to, message), caseSensitivity),
+        CasedString(fmt::format("{} --> {}", to, from), caseSensitivity));
 }
 
 struct AliasMatcher {