diff --git a/include/caosdb/connection.h b/include/caosdb/connection.h
index de72d320932f78041c5a8261407f0a6380b8286e..1f47cc045baf3f0217c315e5d9e9b4e826007d54 100644
--- a/include/caosdb/connection.h
+++ b/include/caosdb/connection.h
@@ -122,7 +122,8 @@ public:
    */
   // TODO(tf) find a way to deal with this:
   // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-  [[nodiscard]] auto RetrieveSingleUser(const std::string &realm, const std::string &name) const -> User;
+  [[nodiscard]] auto RetrieveSingleUser(const std::string &realm, const std::string &name) const
+    -> User;
 
   /**
    * Create a new user.
diff --git a/src/caosdb/connection.cpp b/src/caosdb/connection.cpp
index bc921760a14f5b9a643b27374d552f2e31601c44..b81eff3017ab53c1c13c3245f54a64a14ef6d843 100644
--- a/src/caosdb/connection.cpp
+++ b/src/caosdb/connection.cpp
@@ -211,8 +211,8 @@ auto Connection::CreateSingleRole(const Role &role) const -> void {
 
 // TODO(tf) find a way to deal with this:
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-[[nodiscard]] auto Connection::RetrieveSingleUser(const std::string &realm, const std::string &name) const
-  -> User {
+[[nodiscard]] auto Connection::RetrieveSingleUser(const std::string &realm,
+                                                  const std::string &name) const -> User {
   RetrieveSingleUserRequest request;
   request.set_name(name);
   request.set_realm(realm);
diff --git a/src/cxxcaosdbcli.cpp b/src/cxxcaosdbcli.cpp
index 3fad499e39020e99fb1e4614a608908917193b88..1c936d9198b64e57ca3ad214769638740cc5d24d 100644
--- a/src/cxxcaosdbcli.cpp
+++ b/src/cxxcaosdbcli.cpp
@@ -22,7 +22,7 @@
 
 // A simple caosdb client
 #ifdef BUILD_ACM
-#include "caosdb/acm/role.h"                                // for Role
+#include "caosdb/acm/role.h" // for Role
 #endif
 #include "caosdb/connection.h"         // for Connection, ConnectionManager
 #include "caosdb/constants.h"          // for LIBCAOSDB_VERSION_MINOR, LIBCAOSDB_V...
@@ -37,8 +37,7 @@
 #include <iostream>                    // for operator<<, basic_ostream, basic_ost...
 #include <memory>                      // for unique_ptr, allocator, __shared_ptr_...
 #include <string>                      // for operator<<, char_traits
-#include <vector>                                           // for vector
-
+#include <vector>                      // for vector
 
 const auto logger_name = "libcaosdb";
 
@@ -73,7 +72,7 @@ auto test_connection() -> void {
             << std::endl;
 }
 
-auto retrieve_entity_by_id(const std::string  &id) -> void {
+auto retrieve_entity_by_id(const std::string &id) -> void {
   std::cout << "Retrieve entity " << id << std::endl;
   const auto &connection = caosdb::connection::ConnectionManager::GetDefaultConnection();
   auto transaction(connection->CreateTransaction());