diff --git a/include/caosdb/utility.h b/include/caosdb/utility.h
index 8b69bc271c53a145226c8951916562e543a82dd1..bfe3780cdae31b66f2227057e0efe060385d6af5 100644
--- a/include/caosdb/utility.h
+++ b/include/caosdb/utility.h
@@ -110,7 +110,8 @@ inline auto get_env_fallback(const char *key, const char *fallback) -> const cha
  * @brief Return the value of an environment variable or - if undefined - the
  * fallback value.
  */
-inline auto get_env_fallback(const std::string &key, const std::string &fallback) -> const std::string {
+inline auto get_env_fallback(const std::string &key, const std::string &fallback)
+  -> const std::string {
   const char *val = get_env_fallback(key.c_str(), fallback.c_str());
 
   auto const result = std::string(val);
diff --git a/src/caosdb/entity.cpp b/src/caosdb/entity.cpp
index 017aac5ca6ab28d6773c16ca7dc9662e5990c2d4..3e14a90f9e1ef3f3d53e5bf7141b2063a70c398e 100644
--- a/src/caosdb/entity.cpp
+++ b/src/caosdb/entity.cpp
@@ -273,7 +273,7 @@ auto Entity::FixValue() -> void { FixValueImpl(this); }
 // Utility functions //////////////////////////////////////////////////////////
 
 // TODO(daniel) cognitive complexity is too high
-template <typename E> auto FixValueImpl(E *ent) -> void { //NOLINT
+template <typename E> auto FixValueImpl(E *ent) -> void { // NOLINT
   const auto &dtype = ent->GetDataType();
   const auto &value = ent->GetValue();
   auto new_value = Value();
diff --git a/src/cxxcaosdbcli.cpp b/src/cxxcaosdbcli.cpp
index 0a4dfcf46c3cc0c475c16a501b8cfc8bdaaf59f1..bb60696e8a0f3b10d2b29e54cac034b89907f9c3 100644
--- a/src/cxxcaosdbcli.cpp
+++ b/src/cxxcaosdbcli.cpp
@@ -26,13 +26,13 @@
 #include "caosdb/entity.h"      // for Entity
 #include "caosdb/exceptions.h"  // for ConfigurationError
 #include "caosdb/info.h"        // for VersionInfo
-#include "caosdb/logging.h"    // for CAOSDB_LOG_TRACE
+#include "caosdb/logging.h"     // for CAOSDB_LOG_TRACE
 #include "caosdb/transaction.h" // for Transaction, ResultSet
 #include <iostream>             // for operator<<, basic_ostream, basic_ost...
 #include <memory>               // for unique_ptr, allocator, __shared_ptr_...
 #include <string>               // for operator<<, char_traits
 
-auto logger_name = "libcaosdb";
+const auto logger_name = "libcaosdb";
 
 auto main() -> int {
 
@@ -56,8 +56,8 @@ auto main() -> int {
     transaction->RetrieveById("120");
     transaction->ExecuteAsynchronously();
     auto t_stat = transaction->WaitForIt();
-    CAOSDB_LOG_INFO(logger_name) << "status: " << t_stat.GetCode()
-                                 << " // " << t_stat.GetDescription();
+    CAOSDB_LOG_INFO(logger_name) << "status: " << t_stat.GetCode() << " // "
+                                 << t_stat.GetDescription();
     const auto &result_set = transaction->GetResultSet();
     if (result_set.size() > 0) {
       // print information
@@ -80,8 +80,8 @@ auto main() -> int {
     q_transaction->Query(query);
     q_transaction->ExecuteAsynchronously();
     t_stat = q_transaction->WaitForIt();
-    CAOSDB_LOG_INFO(logger_name) << "status: " << t_stat.GetCode()
-                                 << " // " << t_stat.GetDescription();
+    CAOSDB_LOG_INFO(logger_name) << "status: " << t_stat.GetCode() << " // "
+                                 << t_stat.GetDescription();
     return 0;
   } catch (const caosdb::exceptions::ConfigurationError &exc) {
     std::cout << "ConfigurationError: " << exc.what() << std::endl;