diff --git a/src/main/java/caosdb/server/entity/Entity.java b/src/main/java/caosdb/server/entity/Entity.java
index 23fb170d1462970b9bbd019115ad158fe778274d..70964233516bb12755e66d9bbae62c58a18c46d1 100644
--- a/src/main/java/caosdb/server/entity/Entity.java
+++ b/src/main/java/caosdb/server/entity/Entity.java
@@ -796,7 +796,9 @@ public class Entity extends AbstractObservable implements EntityInterface {
     int pidx = 0;
     for (final Element pe : element.getChildren()) {
       if (pe.getName().equalsIgnoreCase("Version")) {
-        // TODO
+        // IGNORE: When it is allowed for clients to set a version id, parsing
+        // the Version element would be done here. Until this is the case, the
+        // Version tag is ignored.
       } else if (pe.getName().equalsIgnoreCase("EmptyString")) {
         // special case: empty string which cannot be distinguished from null
         // values otherwise.
diff --git a/src/main/java/caosdb/server/entity/Version.java b/src/main/java/caosdb/server/entity/Version.java
index 43cdcd54ecb1dde9143f18033b9eb42575a67a0f..1175e347fb0c4eb0949dbe3de2dcb23a18943a6f 100644
--- a/src/main/java/caosdb/server/entity/Version.java
+++ b/src/main/java/caosdb/server/entity/Version.java
@@ -3,6 +3,11 @@ package caosdb.server.entity;
 import caosdb.datetime.UTCDateTime;
 import java.util.LinkedList;
 
+/**
+ * Plain old java object (POJO) for an entity's version.
+ *
+ * @author Timm Fitschen <t.fitschen@indiscale.com>
+ */
 public class Version {
 
   private String id = null;
diff --git a/src/main/java/caosdb/server/entity/xml/EntityToElementStrategy.java b/src/main/java/caosdb/server/entity/xml/EntityToElementStrategy.java
index bfa5e8854765f1271981f5a28b60c1aa3450b8f8..db16e116c5493dc768ca48466d4bed9bb5cc63c2 100644
--- a/src/main/java/caosdb/server/entity/xml/EntityToElementStrategy.java
+++ b/src/main/java/caosdb/server/entity/xml/EntityToElementStrategy.java
@@ -51,7 +51,7 @@ public class EntityToElementStrategy implements ToElementStrategy {
       element.setAttribute("id", Integer.toString(entity.getId()));
     }
     if (setFieldStrategy.isToBeSet("version") && entity.hasVersion()) {
-      Element v = new VersionXMLConverter().toElement(entity.getVersion());
+      Element v = new VersionXMLSerializer().toElement(entity.getVersion());
       element.addContent(v);
     }
     if (setFieldStrategy.isToBeSet("cuid") && entity.hasCuid()) {
diff --git a/src/main/java/caosdb/server/entity/xml/VersionXMLConverter.java b/src/main/java/caosdb/server/entity/xml/VersionXMLSerializer.java
similarity index 88%
rename from src/main/java/caosdb/server/entity/xml/VersionXMLConverter.java
rename to src/main/java/caosdb/server/entity/xml/VersionXMLSerializer.java
index 06762c38a8c6503032b14e33f6ee5be702c91ab5..552a0760bcdb1d2d686dbcdbaea7783facb62fb2 100644
--- a/src/main/java/caosdb/server/entity/xml/VersionXMLConverter.java
+++ b/src/main/java/caosdb/server/entity/xml/VersionXMLSerializer.java
@@ -4,7 +4,12 @@ import caosdb.server.entity.Version;
 import java.util.TimeZone;
 import org.jdom2.Element;
 
-class VersionXMLConverter {
+/**
+ * Creates a JDOM Element for a Version instance.
+ *
+ * @author Timm Fitschen <t.fitschen@indiscale.com>
+ */
+class VersionXMLSerializer {
   public Element toElement(Version version) {
     Element result = new Element("Version");
     result.setAttribute("id", version.getId());
diff --git a/src/main/java/caosdb/server/resource/transaction/handlers/SimpleDeleteRequestHandler.java b/src/main/java/caosdb/server/resource/transaction/handlers/SimpleDeleteRequestHandler.java
index 586d9085e79ebfb6a6999bf2bc63367ecdac078e..de4aaa8452e2220f751e43daf0bcee2f391bd09a 100644
--- a/src/main/java/caosdb/server/resource/transaction/handlers/SimpleDeleteRequestHandler.java
+++ b/src/main/java/caosdb/server/resource/transaction/handlers/SimpleDeleteRequestHandler.java
@@ -29,6 +29,9 @@ public class SimpleDeleteRequestHandler extends RequestHandler<DeleteContainer>
 
   @Override
   public void handle(final EntityResource t, final DeleteContainer container) throws Exception {
+    // TODO a lot of code duplication, see SimpleGetRequestHandle#handle.
+    // However, this is about to be changed again when string ids are
+    // introduced, anyways. So we just leave it.
     for (final String item : t.getRequestedItems()) {
       String[] elem = item.split("@", 1);
       Integer id = null;