diff --git a/include/caosdb/authentication.h b/include/caosdb/authentication.h
index ffc2cabf91ebb2f3e8c8bd150bfb5423cd10e583..2e117265d71f660888d6fd76d5fe3a3f898cac95 100644
--- a/include/caosdb/authentication.h
+++ b/include/caosdb/authentication.h
@@ -27,15 +27,15 @@
* @date 2021-06-28
* @brief Configuration and setup of the client authentication.
*/
-#include "caosdb/utility.h" // for base64_encode
-#include <grpcpp/security/auth_context.h> // for AuthContext
-#include <grpcpp/security/credentials.h> // for CallCredentials
-#include <grpcpp/support/interceptor.h> // for Status
-#include <grpcpp/support/status.h> // for Status
-#include <grpcpp/support/string_ref.h> // for string_ref
-#include <map> // for multimap
-#include <memory> // for shared_ptr
-#include <string> // for string
+#include "caosdb/utility.h" // for base64_encode
+#include <grpcpp/security/auth_context.h> // for AuthContext
+#include <grpcpp/security/credentials.h> // for CallCredentials
+#include <grpcpp/support/interceptor.h> // for Status
+#include <grpcpp/support/status.h> // for Status
+#include <grpcpp/support/string_ref.h> // for string_ref
+#include <map> // for multimap
+#include <memory> // for shared_ptr
+#include <string> // for string
namespace caosdb {
namespace authentication {
diff --git a/include/caosdb/transaction.h b/include/caosdb/transaction.h
index 0795abf07b45819d3b4dfe618558c7fa7c0461bb..535f747dcd93af9cf819abe20a959f3f58eab71f 100644
--- a/include/caosdb/transaction.h
+++ b/include/caosdb/transaction.h
@@ -21,23 +21,23 @@
#ifndef CAOSDB_TRANSACTION_H
#define CAOSDB_TRANSACTION_H
-#include "caosdb/entity.h" // for Entity, FileDe...
-#include "caosdb/entity/v1/main.grpc.pb.h" // for EntityTransact...
-#include "caosdb/entity/v1/main.pb.h" // for MultiTransacti...
-#include "caosdb/file_descriptor.h" // for FileDescriptor
-#include "caosdb/handler_interface.h" // for HandlerInterface
-#include "caosdb/transaction_handler.h" // for EntityTransactionHandler
-#include "caosdb/logging.h" // for CAOSDB_LOG_ERR...
-#include "caosdb/protobuf_helper.h" // for get_arena
-#include "caosdb/status_code.h" // for StatusCode
-#include "caosdb/transaction_status.h" // for StatusCode
-#include <algorithm> // for max
-#include <future> // for async, future
-#include <google/protobuf/arena.h> // for Arena
-#include <google/protobuf/util/json_util.h> // for MessageToJsonS...
-#include <grpcpp/completion_queue.h> // for CompletionQueue
-#include <iterator> // for iterator, next
-#include <map> // for map
+#include "caosdb/entity.h" // for Entity, FileDe...
+#include "caosdb/entity/v1/main.grpc.pb.h" // for EntityTransact...
+#include "caosdb/entity/v1/main.pb.h" // for MultiTransacti...
+#include "caosdb/file_descriptor.h" // for FileDescriptor
+#include "caosdb/handler_interface.h" // for HandlerInterface
+#include "caosdb/transaction_handler.h" // for EntityTransactionHandler
+#include "caosdb/logging.h" // for CAOSDB_LOG_ERR...
+#include "caosdb/protobuf_helper.h" // for get_arena
+#include "caosdb/status_code.h" // for StatusCode
+#include "caosdb/transaction_status.h" // for StatusCode
+#include <algorithm> // for max
+#include <future> // for async, future
+#include <google/protobuf/arena.h> // for Arena
+#include <google/protobuf/util/json_util.h> // for MessageToJsonS...
+#include <grpcpp/completion_queue.h> // for CompletionQueue
+#include <iterator> // for iterator, next
+#include <map> // for map
// IWYU pragma: no_include <ext/alloc_traits.h>
#include <memory> // for unique_ptr
#include <mutex> // for mutex
diff --git a/src/caosdb/authentication.cpp b/src/caosdb/authentication.cpp
index 71dd48a645d1f0f8a5b946c307919672aca05898..7faa8619b4153c8ff3c03549369b7d976a62e035 100644
--- a/src/caosdb/authentication.cpp
+++ b/src/caosdb/authentication.cpp
@@ -19,11 +19,11 @@
*
*/
#include "caosdb/authentication.h"
-#include <grpcpp/security/credentials.h> // for MetadataCredentialsPlugin
-#include <map> // for multimap
-#include <memory> // for allocator, shared_ptr
-#include <string> // for basic_string, operator+
-#include <utility> // for pair, move, make_pair
+#include <grpcpp/security/credentials.h> // for MetadataCredentialsPlugin
+#include <map> // for multimap
+#include <memory> // for allocator, shared_ptr
+#include <string> // for basic_string, operator+
+#include <utility> // for pair, move, make_pair
namespace caosdb::authentication {
using caosdb::utility::base64_encode;
diff --git a/src/caosdb/connection.cpp b/src/caosdb/connection.cpp
index d2ef513c54edf4996f49f6d944f458f09876dfe9..867c38a9be90a127a84c5b3e104497535cf7ec3d 100644
--- a/src/caosdb/connection.cpp
+++ b/src/caosdb/connection.cpp
@@ -20,18 +20,18 @@
*
*/
#include "caosdb/connection.h"
-#include "caosdb/configuration.h" // for ConnectionConfigur...
-#include "caosdb/exceptions.h" // for ConfigurationError
-#include "caosdb/info.h" // for VersionInfo
-#include "caosdb/info/v1/main.grpc.pb.h" // for GeneralInfoService
-#include "caosdb/info/v1/main.pb.h" // for GetVersionInfoRequest
-#include "caosdb/transaction.h" // for Transaction
-#include "caosdb/transaction_status.h" // for TransactionStatus
-#include <grpcpp/client_context.h> // for ClientContext
-#include <grpcpp/create_channel.h> // for CreateChannel
-#include <grpcpp/support/status.h> // for Status
-#include <grpcpp/support/status_code_enum.h> // for StatusCode, UNAUTHENTIC...
-#include <string> // for string, operator+
+#include "caosdb/configuration.h" // for ConnectionConfigur...
+#include "caosdb/exceptions.h" // for ConfigurationError
+#include "caosdb/info.h" // for VersionInfo
+#include "caosdb/info/v1/main.grpc.pb.h" // for GeneralInfoService
+#include "caosdb/info/v1/main.pb.h" // for GetVersionInfoRequest
+#include "caosdb/transaction.h" // for Transaction
+#include "caosdb/transaction_status.h" // for TransactionStatus
+#include <grpcpp/client_context.h> // for ClientContext
+#include <grpcpp/create_channel.h> // for CreateChannel
+#include <grpcpp/support/status.h> // for Status
+#include <grpcpp/support/status_code_enum.h> // for StatusCode, UNAUTHENTIC...
+#include <string> // for string, operator+
namespace caosdb::connection {
using caosdb::configuration::ConfigurationManager;
diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index bbd747e79a8cb7f3a5fc8c10a36f5db735c59bec..740945faeb2fc91ee43129165c24d630015ee365 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -30,7 +30,7 @@
#include "caosdb/transaction_handler.h" // for EntityTransactionHandler
#include <algorithm> // for max
//
-#include <chrono> // for chrono_literals
+#include <chrono> // for chrono_literals
#include <exception> // IWYU pragma: keep
#include <filesystem> // for operator<<, path
#include <future> // for async, future
@@ -40,7 +40,7 @@
#include <memory> // for unique_ptr
#include <random> // for mt19937, rand...
#include <system_error> // for std::system_error
-#include <thread> // for sleep
+#include <thread> // for sleep
#include <utility> // for move, pair
// IWYU pragma: no_include <bits/exception.h>
// IWYU pragma: no_include <cxxabi.h>
@@ -499,7 +499,6 @@ void Transaction::Cancel() {
std::this_thread::sleep_for(5ms);
}
-
this->status = TransactionStatus::CANCELLED();
if (handler_ != nullptr) {
handler_->Cancel();