diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
index a24b79f154a0b3c5f304c302a8ee6a8ad0658a95..7e16e4a2b736f60abf7ec8f959318abca3a9c3df 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
@@ -125,7 +125,7 @@ public class Parameters implements ITimingParameters
      * If set to true, than directory with incoming data is supposed to be on a remote share. It implies that a special
      * care will be taken when coping is performed from that directory.
      */
-    @Option(name = "r", longName = "treat-incoming-as-remote", usage = "If set to true, than directory with incoming data "
+    @Option(name = "r", longName = "treat-incoming-as-remote", usage = "If flag is set, than directory with incoming data "
             + "is supposed to be on a remote share.")
     private boolean treatIncomingAsRemote;
 
@@ -147,15 +147,13 @@ public class Parameters implements ITimingParameters
      */
     @Option(longName = "incoming-host", metaVar = "HOST", usage = "The remote host to move the data from")
     private String incomingHost = null;
-    
+
     /**
      * The directory to monitor for new files and directories to move to outgoing.
      */
-    @Option(longName = "incoming-dir", metaVar = "DIR", usage = "The local directory where "
-            + "the data producer writes to.")
+    @Option(longName = "incoming-dir", metaVar = "DIR", usage = "The directory where the data producer writes to.")
     private File incomingDirectory = null;
- 
- 
+
     /**
      * The directory for local files and directories manipulations.
      */
diff --git a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/ParametersTest.java b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/ParametersTest.java
index 48d881886c433b619c9d19b0199a55dcc5efe3bf..e0f72d417b1952ba34497f6f41855a101768433b 100644
--- a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/ParametersTest.java
+++ b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/ParametersTest.java
@@ -218,14 +218,13 @@ public class ParametersTest
         final String REMOTE_HOST = "myremotehost";
         final int CHECK_INTERVAL = 22;
         final int QUIET_PERIOD = 33;
-        final String TREAT_AS_REMOTE = Boolean.toString(true);
         final String REMOTE_INCOMING_HOST = "my-remote-incoming-host";
 
         final Parameters parameters =
                 parse("--incoming-dir", LOCAL_DATADIR, "--buffer-dir", LOCAL_TEMPDIR, "--outgoing-dir", REMOTE_DATADIR,
                         "--outgoing-host", REMOTE_HOST, "--check-interval", Integer.toString(CHECK_INTERVAL),
                         "--quiet-period", Integer.toString(QUIET_PERIOD), "--treat-incoming-as-remote",
-                        TREAT_AS_REMOTE, "--incoming-host", REMOTE_INCOMING_HOST);
+                        "--incoming-host", REMOTE_INCOMING_HOST);
         assertEquals(LOCAL_DATADIR, parameters.getIncomingStore().getPath().getPath());
         assertEquals(REMOTE_INCOMING_HOST, parameters.getIncomingStore().getHost());
         assertEquals(LOCAL_TEMPDIR, parameters.getBufferStore().getPath().getPath());
@@ -233,7 +232,7 @@ public class ParametersTest
         assertEquals(REMOTE_HOST, parameters.getOutgoingStore().getHost());
         assertEquals(1000 * CHECK_INTERVAL, parameters.getCheckIntervalMillis());
         assertEquals(1000 * QUIET_PERIOD, parameters.getQuietPeriodMillis());
-        assertEquals(TREAT_AS_REMOTE, parameters.getTreatIncomingAsRemote());
+        assertEquals(true, parameters.getTreatIncomingAsRemote());
     }
 
 }