diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
index 57e087fff2df1037b8b140da46a10c8c53ff2e52..b1646aeca9ba8d1030dd5b3cbac5ad324acd454e 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
@@ -152,7 +152,7 @@ public class DataMover
         return new DataMoverProcess(outgoingMovingTask, "Final Destination Mover");
     }
 
-    // TODO 2007-10-10 Tomasz Pylak: remove this when DirectoryScanningTimerTask will work with IStoreHandler. This is a
+    // TODO 2007-10-10, Tomasz Pylak: remove this when DirectoryScanningTimerTask will work with IStoreHandler. This is a
     // quick hack.
     private static IPathHandler asPathHandler(final IStoreHandler storeHandler)
     {
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/IncomingProcessor.java b/datamover/source/java/ch/systemsx/cisd/datamover/IncomingProcessor.java
index e64049b119a1723978bb81920f9ee0076fd686a4..e1093596856df79d950a5455287800221cc90c95 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/IncomingProcessor.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/IncomingProcessor.java
@@ -100,14 +100,14 @@ public class IncomingProcessor implements IRecoverableTimerTaskFactory
         final IStoreHandler pathHandler = createIncomingMovingPathHandler();
         final FileFilter filter = createQuietPeriodFilter();
 
-        // TODO 2007-10-10 Tomasz Pylak: refactor not to use incomingStore.getPath()
+        // TODO 2007-10-10, Tomasz Pylak: refactor not to use incomingStore.getPath()
         final DirectoryScanningTimerTask movingTask =
                 new DirectoryScanningTimerTask(incomingStore.getPath(), filter, asPathHandler(pathHandler),
                         NUMBER_OF_ERRORS_IN_LISTING_IGNORED);
         return new DataMoverProcess(movingTask, "Mover of Incoming Data", this);
     }
 
-    // TODO 2007-10-10 Tomasz Pylak: remove this when DirectoryScanningTimerTask will work with IStoreHandler. This is a
+    // TODO 2007-10-10, Tomasz Pylak: remove this when DirectoryScanningTimerTask will work with IStoreHandler. This is a
     // quick hack.
     private static IPathHandler asPathHandler(final IStoreHandler storeHandler)
     {
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/FileStore.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/FileStore.java
index 7e5d0385e9c180b83cc29f2377a3f7c0237175cc..86aaebd65888812ba4f4e6874eaa260978ccc70b 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/FileStore.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/FileStore.java
@@ -54,7 +54,7 @@ public abstract class FileStore
         this.factory = factory;
     }
 
-    // TODO 2007-10-10 Tomasz Pylak: change visibility to protected after changing DirectoryScanningTimerTask
+    // TODO 2007-10-10, Tomasz Pylak: change visibility to protected after changing DirectoryScanningTimerTask
     public final File getPath()
     {
         return path;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemote.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemote.java
index 14399bd3fdb8032f2c26dd5066555e10280f8029..ef42ce0f03b6993c206d78083478e849e1f682da 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemote.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemote.java
@@ -43,7 +43,7 @@ public class FileStoreRemote extends FileStore
     @Override
     public Status delete(StoreItem item)
     {
-        // TODO 2007-10-09 implement ssh tunneling mode
+        // TODO 2007-10-09, Tomasz Pylak: implement ssh tunneling mode
         return Status.OK;
     }
 
@@ -63,14 +63,14 @@ public class FileStoreRemote extends FileStore
     @Override
     public long lastChanged(StoreItem item)
     {
-        // TODO 2007-10-09 implement ssh tunneling mode
+        // TODO 2007-10-09, Tomasz Pylak: implement ssh tunneling mode
         return 0;
     }
 
     @Override
     public String tryCheckDirectoryFullyAccessible()
     {
-        // TODO 2007-10-09 implement ssh tunneling mode. E.g. check if directory exists
+        // TODO 2007-10-09, Tomasz Pylak: implement ssh tunneling mode. E.g. check if directory exists
         return null;
     }