--- a/macs2_predictd.xml	Thu Feb 12 10:40:25 2015 -0500
+++ b/macs2_predictd.xml	Mon Oct 12 11:24:39 2015 -0400
@@ -1,13 +1,14 @@
 <tool id="macs2_predictd" name="MACS2 predictd" version="@VERSION_STRING@.0">
     <description>Predict 'd' or fragment size from alignment results</description>
+    <macros>
+        <import>macs2_macros.xml</import>
+    </macros>
     <expand macro="requirements">
         <requirement type="package" version="3.0.1">R_3_0_1</requirement>
         <requirement type="package" version="4.1.0">gnu_awk</requirement>
     </expand>
+    <expand macro="stdio" />
     <expand macro="version_command" />
-    <macros>
-        <import>macs2_macros.xml</import>
-    </macros>
     <command>
         macs2 predictd
             -i ${ ' '.join( map( lambda x:'"%s"' % ( x ), $infiles ) ) }
@@ -20,12 +21,11 @@
             2>&amp;1 | awk -F: '{print $4}' | awk '{$1=$1}1'
 
             &gt; "${ outfile }"
-            
+
         &amp;&amp;
 
         Rscript predictd
     </command>
-    <expand macro="stdio" />
     <inputs>
         <param name="infiles" type="data" format="bam,sam,bed" multiple="True" label="ChIP-seq alignment file" help="If multiple files are given, then they will all be read and combined. Note that pair-end data is not supposed to work with this command. (-i)" />
         <expand macro="conditional_effective_genome_size" />