diff --git a/src/class_diagram/model/template_parameter.cc b/src/class_diagram/model/template_parameter.cc
index 32a8c510..d4d9f4fa 100644
--- a/src/class_diagram/model/template_parameter.cc
+++ b/src/class_diagram/model/template_parameter.cc
@@ -187,7 +187,7 @@ bool template_parameter::find_nested_relationships(
     // just add it and skip recursion (e.g. this is a user defined type)
     if (should_include(name())) {
         if (id()) {
-            nested_relationships.push_back({id().value(), hint});
+            nested_relationships.emplace_back(id().value(), hint);
             added_aggregation_relationship =
                 (hint == common::model::relationship_t::kAggregation);
         }
@@ -199,8 +199,8 @@ bool template_parameter::find_nested_relationships(
             if (should_include(template_argument.name()) &&
                 template_argument.id()) {
 
-                nested_relationships.push_back(
-                    {template_argument.id().value(), hint});
+                nested_relationships.emplace_back(
+                    template_argument.id().value(), hint);
 
                 added_aggregation_relationship =
                     (hint == common::model::relationship_t::kAggregation);
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index c105930a..7fa2712c 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -1745,7 +1745,7 @@ void translation_unit_visitor::
             if (!param_type->getAs<clang::RecordType>())
                 continue;
 
-            auto classTemplateSpecialization =
+            auto *classTemplateSpecialization =
                 llvm::dyn_cast<clang::ClassTemplateSpecializationDecl>(
                     param_type->getAsRecordDecl());
 
diff --git a/src/sequence_diagram/visitor/translation_unit_visitor.cc b/src/sequence_diagram/visitor/translation_unit_visitor.cc
index e78b65dd..b9f0dd98 100644
--- a/src/sequence_diagram/visitor/translation_unit_visitor.cc
+++ b/src/sequence_diagram/visitor/translation_unit_visitor.cc
@@ -462,7 +462,7 @@ bool translation_unit_visitor::VisitLambdaExpr(clang::LambdaExpr *expr)
     auto m_ptr = std::make_unique<sequence_diagram::model::method>(
         config().using_namespace());
 
-    auto method_name = "operator()";
+    const auto *method_name = "operator()";
     m_ptr->set_method_name(method_name);
 
     m_ptr->set_class_id(cls_id);