diff --git a/include/caosdb/data_type.h b/include/caosdb/data_type.h
index cd141d68477d7d5b30a9f8bdfb46dc3440ed6c0c..7afc694b6a3a723d126c21a45c52d9f4c9a7f710 100644
--- a/include/caosdb/data_type.h
+++ b/include/caosdb/data_type.h
@@ -20,9 +20,10 @@
  */
 
 /**
- * DataTypes have 2 dimensions: They may be atomic or reference typed, and they may be scalar or
- * list valued.  If they are atomic, they have an AtomicDataType.  If they are reference typed, the
- * reference name can be obtained with GetName().
+ * DataTypes have 2 dimensions: They may be atomic or reference typed, and they
+ * may be scalar or list valued.  If they are atomic, they have an
+ * AtomicDataType.  If they are reference typed, the reference name can be
+ * obtained with GetName().
  */
 
 #ifndef CAOSDB_DATA_TYPE_H
diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h
index 8d3aeb9e4e489d9de73ebba6911c55b7b3e690bd..b66a0d21e0cacb89df8652a0bdee45a11f2adbc2 100644
--- a/include/caosdb/entity.h
+++ b/include/caosdb/entity.h
@@ -559,8 +559,8 @@ private:
  *
  * Should only be instantiated and write-accessed by the owning entity.
  *
- * Note that iterating over the Property contents only works via references, since the Property copy
- * constructor is deliberately disabled:
+ * Note that iterating over the Property contents only works via references,
+ * since the Property copy constructor is deliberately disabled:
  *
  * \code
  * // Accessing single properties as reference
diff --git a/test/test_entity.cpp b/test/test_entity.cpp
index e7d3ef5c899d9bc772d814128b49beb07e960114..0726bece7105d8778ae3d8b0816530e3a9de9395 100644
--- a/test/test_entity.cpp
+++ b/test/test_entity.cpp
@@ -31,10 +31,10 @@
 #include "caosdb/transaction.h"                  // for Transaction
 #include "caosdb/value.h"                        // for Value
 #include <exception>
-#include <google/protobuf/arena.h>               // for Arena
-#include <gtest/gtest-message.h>                 // for Message
-#include <gtest/gtest-test-part.h>               // for TestPartResult, Sui...
-#include <gtest/gtest_pred_impl.h>               // for Test, EXPECT_EQ
+#include <google/protobuf/arena.h> // for Arena
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, Sui...
+#include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ
 #include <iostream>
 #include <memory> // for allocator, shared_ptr
 #include <stdexcept>
@@ -398,7 +398,7 @@ TEST(test_entity, test_property_iterator) {
   ASSERT_EQ(entity.GetProperties().size(), 5);
   int counter = 0;
   for (auto &property : entity.GetProperties()) {
-    // TODO Copy constructor was deleted
+    // TODO(tf) Copy constructor was deleted
     // auto nonref_property = entity.GetProperties().at(counter);
     auto name = "PROPERTY-" + std::to_string(counter);
     EXPECT_EQ(property.GetName(), name);