diff --git a/src/class_diagram/model/class.h b/src/class_diagram/model/class.h
index 87086b20..3a6291c4 100644
--- a/src/class_diagram/model/class.h
+++ b/src/class_diagram/model/class.h
@@ -107,8 +107,8 @@ private:
 
 namespace std {
 template <>
-struct hash<std::reference_wrapper<
-    const clanguml::class_diagram::model::class_>> {
+struct hash<
+    std::reference_wrapper<const clanguml::class_diagram::model::class_>> {
     std::size_t operator()(const std::reference_wrapper<
         const clanguml::class_diagram::model::class_> &key) const
     {
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 6fa0fd65..d5642d02 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -245,7 +245,7 @@ bool translation_unit_visitor::VisitClassTemplateSpecializationDecl(
         // Check if the class was already processed within
         // VisitClassTemplateDecl()
         if (diagram_.has_element(cls->getID()))
-            return true;
+        return true;
 
     // TODO: Add support for classes defined in function/method bodies
     if (cls->isLocalClass())
diff --git a/src/class_diagram/visitor/translation_unit_visitor.h b/src/class_diagram/visitor/translation_unit_visitor.h
index e48594f6..f312faf1 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.h
+++ b/src/class_diagram/visitor/translation_unit_visitor.h
@@ -144,7 +144,8 @@ private:
         const clang::TemplateSpecializationType &template_instantiation_type);
 
     void process_unexposed_template_specialization_parameters(
-        const std::string &tspec, clanguml::class_diagram::model::template_parameter &tp,
+        const std::string &tspec,
+        clanguml::class_diagram::model::template_parameter &tp,
         clanguml::class_diagram::model::class_ &c);
 
     bool find_relationships_in_unexposed_template_params(
diff --git a/src/common/model/diagram.h b/src/common/model/diagram.h
index 8e48d99a..101872bb 100644
--- a/src/common/model/diagram.h
+++ b/src/common/model/diagram.h
@@ -67,7 +67,8 @@ public:
         return false;
     }
 
-    virtual bool should_include(const namespace_ &ns, const std::string &name) const;
+    virtual bool should_include(
+        const namespace_ &ns, const std::string &name) const;
 
 private:
     std::string name_;
diff --git a/src/common/model/diagram_element.cc b/src/common/model/diagram_element.cc
index 6dbb1161..3ab72d00 100644
--- a/src/common/model/diagram_element.cc
+++ b/src/common/model/diagram_element.cc
@@ -86,7 +86,7 @@ inja::json diagram_element::context() const
 bool operator==(const diagram_element &l, const diagram_element &r)
 {
     return l.id() == r.id();
-    //return l.full_name(false) == r.full_name(false);
+    // return l.full_name(false) == r.full_name(false);
 }
 
 std::ostream &operator<<(std::ostream &out, const diagram_element &rhs)
diff --git a/src/common/model/element.h b/src/common/model/element.h
index 00db43b5..e4655b43 100644
--- a/src/common/model/element.h
+++ b/src/common/model/element.h
@@ -34,8 +34,6 @@ namespace clanguml::common::model {
 
 class element : public diagram_element, public source_location {
 public:
-
-
     element(const namespace_ &using_namespace);
 
     virtual ~element() = default;
diff --git a/src/include_diagram/generators/plantuml/include_diagram_generator.cc b/src/include_diagram/generators/plantuml/include_diagram_generator.cc
index 6a0ee957..1543ff6a 100644
--- a/src/include_diagram/generators/plantuml/include_diagram_generator.cc
+++ b/src/include_diagram/generators/plantuml/include_diagram_generator.cc
@@ -37,25 +37,26 @@ void generator::generate_relationships(
 
     namespace plantuml_common = clanguml::common::generators::plantuml;
 
-//    if (f.type() == common::model::source_file_t::kDirectory) {
-//        util::for_each(f, [this, &ostr](const auto &file) {
-//            generate_relationships(
-//                dynamic_cast<const source_file &>(*file), ostr);
-//        });
-//    }
-//    else {
-//        util::for_each_if(
-//            f.relationships(),
-//            [this](const auto &r) {
-//                return m_model.should_include(r.type()) &&
-//                    util::contains(m_generated_aliases, r.destination());
-//            },
-//            [&f, &ostr](const auto &r) {
-//                ostr << f.alias() << " "
-//                     << plantuml_common::to_plantuml(r.type(), r.style()) << " "
-//                     << r.destination() << '\n';
-//            });
-//    }
+    //    if (f.type() == common::model::source_file_t::kDirectory) {
+    //        util::for_each(f, [this, &ostr](const auto &file) {
+    //            generate_relationships(
+    //                dynamic_cast<const source_file &>(*file), ostr);
+    //        });
+    //    }
+    //    else {
+    //        util::for_each_if(
+    //            f.relationships(),
+    //            [this](const auto &r) {
+    //                return m_model.should_include(r.type()) &&
+    //                    util::contains(m_generated_aliases, r.destination());
+    //            },
+    //            [&f, &ostr](const auto &r) {
+    //                ostr << f.alias() << " "
+    //                     << plantuml_common::to_plantuml(r.type(), r.style())
+    //                     << " "
+    //                     << r.destination() << '\n';
+    //            });
+    //    }
 }
 
 void generator::generate(const source_file &f, std::ostream &ostr) const
diff --git a/src/include_diagram/visitor/translation_unit_visitor.h b/src/include_diagram/visitor/translation_unit_visitor.h
index 6a1541ce..a587de99 100644
--- a/src/include_diagram/visitor/translation_unit_visitor.h
+++ b/src/include_diagram/visitor/translation_unit_visitor.h
@@ -42,7 +42,8 @@ public:
 
     void operator()(const cppast::cpp_entity &file);
 
-    void finalize() {}
+    void finalize() { }
+
 private:
     clang::SourceManager &source_manager_;
 
diff --git a/src/main.cc b/src/main.cc
index c1a3633a..34012dd0 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -106,9 +106,8 @@ int main(int argc, const char *argv[])
 
     std::string err{};
 
-    auto db =
-        clang::tooling::CompilationDatabase::autoDetectFromDirectory(
-            config.compilation_database_dir(), err);
+    auto db = clang::tooling::CompilationDatabase::autoDetectFromDirectory(
+        config.compilation_database_dir(), err);
 
     if (!err.empty()) {
         LOG_ERROR("Failed to load compilation database from {}",
diff --git a/src/package_diagram/generators/plantuml/package_diagram_generator.cc b/src/package_diagram/generators/plantuml/package_diagram_generator.cc
index c73d0523..f92638f2 100644
--- a/src/package_diagram/generators/plantuml/package_diagram_generator.cc
+++ b/src/package_diagram/generators/plantuml/package_diagram_generator.cc
@@ -32,15 +32,16 @@ void generator::generate_relationships(
 {
     LOG_DBG("Generating relationships for package {}", p.full_name(true));
 
-//    const auto &uns = m_config.using_namespace();
+    //    const auto &uns = m_config.using_namespace();
 
     // Generate this packages relationship
     if (m_model.should_include(relationship_t::kDependency)) {
         for (const auto &r : p.relationships()) {
             std::stringstream relstr;
             try {
-                relstr << p.alias() << " ..> "
-                       //<< m_model.get_         to_alias(uns.relative(r.destination()))
+                relstr << p.alias()
+                       << " ..> "
+                       //<< m_model.get_ to_alias(uns.relative(r.destination()))
                        << '\n';
                 ostr << relstr.str();
             }
diff --git a/src/package_diagram/visitor/translation_unit_visitor.h b/src/package_diagram/visitor/translation_unit_visitor.h
index cddd657a..3a18f70e 100644
--- a/src/package_diagram/visitor/translation_unit_visitor.h
+++ b/src/package_diagram/visitor/translation_unit_visitor.h
@@ -34,13 +34,14 @@
 namespace clanguml::package_diagram::visitor {
 
 class translation_unit_visitor
-    : public clang::RecursiveASTVisitor<translation_unit_visitor>{
+    : public clang::RecursiveASTVisitor<translation_unit_visitor> {
 public:
     translation_unit_visitor(clang::SourceManager &sm,
         clanguml::package_diagram::model::diagram &diagram,
         const clanguml::config::package_diagram &config);
 
-    void finalize() {}
+    void finalize() { }
+
 private:
     clang::SourceManager &source_manager_;
 
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index 3daa67be..6559ef9a 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -22,7 +22,6 @@
 #include "cx/util.h"
 #include "translation_unit_context.h"
 
-
 namespace clanguml::sequence_diagram::visitor {
 
 translation_unit_visitor::translation_unit_visitor(clang::SourceManager &sm,
@@ -34,7 +33,6 @@ translation_unit_visitor::translation_unit_visitor(clang::SourceManager &sm,
 {
 }
 
-
 /*
 void translation_unit_visitor::process_activities(const cppast::cpp_function &e)
 {
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.h b/src/sequence_diagram/visitor/translation_unit_visitor.h
index b1ed7845..043d083d 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.h
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.h
@@ -33,7 +33,8 @@ public:
         clanguml::sequence_diagram::model::diagram &diagram,
         const clanguml::config::sequence_diagram &config);
 
-    void finalize() {}
+    void finalize() { }
+
 private:
     clang::SourceManager &source_manager_;
 
diff --git a/tests/t00014/test_case.h b/tests/t00014/test_case.h
index 37854e0a..a603593e 100644
--- a/tests/t00014/test_case.h
+++ b/tests/t00014/test_case.h
@@ -46,7 +46,7 @@ TEST_CASE("t00014", "[test-case][class]")
     REQUIRE_THAT(puml, IsClassTemplate("A", "double,float"));
     REQUIRE_THAT(puml, IsClassTemplate("A", "bool,std::string"));
     REQUIRE_THAT(puml, IsClassTemplate("A", "std::string,std::string"));
-//    REQUIRE_THAT(puml, IsClassTemplate("A", "char,std::string"));
+    //    REQUIRE_THAT(puml, IsClassTemplate("A", "char,std::string"));
     REQUIRE_THAT(puml, IsClass(_A("B")));
 
     REQUIRE_THAT(puml, IsField<Private>("bapair", "PairPairBA<bool>"));
@@ -83,10 +83,12 @@ TEST_CASE("t00014", "[test-case][class]")
     REQUIRE_THAT(puml, IsInstantiation(_A("A<T,P>"), _A("A<T,std::string>")));
     REQUIRE_THAT(puml,
         IsInstantiation(_A("A<T,std::string>"), _A("A<bool,std::string>")));
-//    REQUIRE_THAT(puml,
-//        IsInstantiation(_A("A<T,std::string>"), _A("A<char,std::string>")));
-//    REQUIRE_THAT(puml,
-//        IsInstantiation(_A("A<T,std::string>"), _A("A<wchar_t,std::string>")));
+    //    REQUIRE_THAT(puml,
+    //        IsInstantiation(_A("A<T,std::string>"),
+    //        _A("A<char,std::string>")));
+    //    REQUIRE_THAT(puml,
+    //        IsInstantiation(_A("A<T,std::string>"),
+    //        _A("A<wchar_t,std::string>")));
 
     REQUIRE_THAT(puml,
         IsInstantiation(_A("A<T,std::unique_ptr<std::string>>"),
@@ -108,8 +110,9 @@ TEST_CASE("t00014", "[test-case][class]")
     REQUIRE_THAT(puml,
         IsAggregation(_A("R"), _A("A<float,std::unique_ptr<std::string>>"),
             "-floatstring"));
-//    REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A<char,std::string>")));
-//    REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A<wchar_t,std::string>")));
+    //    REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A<char,std::string>")));
+    //    REQUIRE_THAT(puml, IsDependency(_A("R"),
+    //    _A("A<wchar_t,std::string>")));
 
     save_puml(
         "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
diff --git a/tests/t00016/test_case.h b/tests/t00016/test_case.h
index baabe7a6..1bc4e8d5 100644
--- a/tests/t00016/test_case.h
+++ b/tests/t00016/test_case.h
@@ -46,8 +46,8 @@ TEST_CASE("t00016", "[test-case][class]")
         puml, IsInstantiation(_A("is_numeric<>"), _A("is_numeric<bool>")));
     REQUIRE_THAT(
         puml, IsInstantiation(_A("is_numeric<>"), _A("is_numeric<char>")));
-    REQUIRE_THAT(puml,
-        IsInstantiation(_A("is_numeric<>"), _A("is_numeric<float>")));
+    REQUIRE_THAT(
+        puml, IsInstantiation(_A("is_numeric<>"), _A("is_numeric<float>")));
 
     save_puml(
         "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
diff --git a/tests/t00017/test_case.h b/tests/t00017/test_case.h
index 02535ab2..e659fa6c 100644
--- a/tests/t00017/test_case.h
+++ b/tests/t00017/test_case.h
@@ -48,7 +48,8 @@ TEST_CASE("t00017", "[test-case][class]")
 
     REQUIRE_THAT(puml, (IsField<Private>("some_int", "int")));
     REQUIRE_THAT(puml, (IsField<Private>("some_int_pointer", "int *")));
-    REQUIRE_THAT(puml, (IsField<Private>("some_int_pointer_pointer", "int **")));
+    REQUIRE_THAT(
+        puml, (IsField<Private>("some_int_pointer_pointer", "int **")));
 
     // Relationship members should not be rendered as part of this testcase
     REQUIRE_THAT(puml, !(IsField<Private>("a", _A("A"))));
diff --git a/tests/t00025/test_case.h b/tests/t00025/test_case.h
index 1beb1fd0..a10c0fef 100644
--- a/tests/t00025/test_case.h
+++ b/tests/t00025/test_case.h
@@ -47,10 +47,8 @@ TEST_CASE("t00025", "[test-case][class]")
         puml, !IsAggregation(_A("ProxyHolder"), _A("Target1"), "+proxy1"));
     REQUIRE_THAT(
         puml, !IsAggregation(_A("ProxyHolder"), _A("Target2"), "+proxy2"));
-    REQUIRE_THAT(
-        puml, IsDependency(_A("Proxy<Target1>"), _A("Target1")));
-    REQUIRE_THAT(
-        puml, IsDependency(_A("Proxy<Target2>"), _A("Target2")));
+    REQUIRE_THAT(puml, IsDependency(_A("Proxy<Target1>"), _A("Target1")));
+    REQUIRE_THAT(puml, IsDependency(_A("Proxy<Target2>"), _A("Target2")));
 
     save_puml(
         "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
diff --git a/tests/t00030/t00030.cc b/tests/t00030/t00030.cc
index 0193421e..7799cd04 100644
--- a/tests/t00030/t00030.cc
+++ b/tests/t00030/t00030.cc
@@ -4,15 +4,20 @@
 namespace clanguml {
 namespace t00030 {
 
-class A { };
+class A {
+};
 
-class B { };
+class B {
+};
 
-class C { };
+class C {
+};
 
-class D { };
+class D {
+};
 
-class E { };
+class E {
+};
 
 struct R {
     /// @uml{association[]}
diff --git a/tests/t00036/t00036.cc b/tests/t00036/t00036.cc
index 0657bb61..952c4ec3 100644
--- a/tests/t00036/t00036.cc
+++ b/tests/t00036/t00036.cc
@@ -25,7 +25,8 @@ namespace ns2 {
 namespace ns22 {
 
 // TODO: Fix for incomplete struct C declaration "struct C;"
-struct C {};
+struct C {
+};
 
 }
 }
diff --git a/tests/t00038/t00038.cc b/tests/t00038/t00038.cc
index 05a96b56..b6ba3b3a 100644
--- a/tests/t00038/t00038.cc
+++ b/tests/t00038/t00038.cc
@@ -32,7 +32,8 @@ struct key_t {
     std::string key;
 };
 
-template <typename T> struct map {};
+template <typename T> struct map {
+};
 
 using namespace thirdparty::ns1;
 
diff --git a/tests/t00044/test_case.h b/tests/t00044/test_case.h
index a7fd6364..6444e8c8 100644
--- a/tests/t00044/test_case.h
+++ b/tests/t00044/test_case.h
@@ -37,7 +37,7 @@ TEST_CASE("t00044", "[test-case][class]")
 
     // TODO:
     // Check dependants filter<void(int), bool>
-    //REQUIRE_THAT(puml, IsClassTemplate("signal_handler", "Ret,Args...,A"));
+    // REQUIRE_THAT(puml, IsClassTemplate("signal_handler", "Ret,Args...,A"));
 
     save_puml(
         "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 1e2da059..d7f330d0 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -41,7 +41,7 @@ load_config(const std::string &test_name)
         clang::tooling::CompilationDatabase::autoDetectFromDirectory(
             config.compilation_database_dir(), err);
 
-    if(!err.empty())
+    if (!err.empty())
         throw std::runtime_error{err};
 
     return std::make_pair(std::move(config), std::move(compilation_database));
diff --git a/tests/test_cases.h b/tests/test_cases.h
index 7ab643e8..5020c6c9 100644
--- a/tests/test_cases.h
+++ b/tests/test_cases.h
@@ -37,8 +37,8 @@
 
 #include "catch.h"
 
-#include <clang/Tooling/Tooling.h>
 #include <clang/Tooling/CompilationDatabase.h>
+#include <clang/Tooling/Tooling.h>
 
 #include <algorithm>
 #include <complex>
@@ -52,7 +52,8 @@ using Catch::Matchers::StartsWith;
 using Catch::Matchers::VectorContains;
 using namespace clanguml::util;
 
-std::pair<clanguml::config::config, std::unique_ptr<clang::tooling::CompilationDatabase>>
+std::pair<clanguml::config::config,
+    std::unique_ptr<clang::tooling::CompilationDatabase>>
 load_config(const std::string &test_name);
 
 std::string generate_sequence_puml(