--- a/tools/xm2jss.c	Tue Mar 03 01:40:56 2015 +0200
+++ b/tools/xm2jss.c	Tue Mar 03 01:58:32 2015 +0200
@@ -654,8 +654,6 @@
     if ((r = jssAllocateModule()) == NULL)
         return NULL;
 
-    // Allocate tables
-    
     // Copy things
     r->moduleType       = m->moduleType;
     r->moduleName       = dm_strdup(m->moduleName);
@@ -685,7 +683,9 @@
         mapPatterns[i]  = jsetNotSet;
     }
 
+    //
     // Find out all actually used patterns and ext.instruments
+    //
     for (i = 0; i < m->norders; i++)
     {
         int pattern = m->orderList[i];
@@ -717,7 +717,7 @@
             else
             {
                 dmErrorMsg("Pattern 0x%x is used on order 0x%x, but has no data!\n",
-                pattern, i);
+                    pattern, i);
 
                 // Fix it.
                 m->orderList[i] = jsetMaxPatterns;
@@ -727,20 +727,22 @@
         if (pattern != jsetMaxPatterns)
         {
             dmErrorMsg("Order 0x%x has invalid pattern number 0x%x!\n",
-            i, pattern);
+                i, pattern);
             
             // Fix it.
             m->orderList[i] = jsetMaxPatterns;
         }
     }
     
-    // Find out used instruments
+    //
+    // Find used instruments
+    //
     for (i = 0; i < jsetMaxInstruments; i++)
     if (usedExtInstruments[i] && m->extInstruments[i] != NULL)
     {
         int note;
         JSSExtInstrument *e = m->extInstruments[i];
-        
+
         for (note = 0; note < jsetNNotes; note++)
         if (e->sNumForNotes[note] != jsetNotSet)
         {
@@ -752,15 +754,17 @@
             else
             {
                 dmErrorMsg("Ext.instrument #%d sNumForNotes[%d] value out range (%d < %d).\n",
-                i, m->ninstruments, q);
+                    i, m->ninstruments, q);
             }
         }
     }
-    
+
+    //
     // Create pattern mappings
+    //
     r->npatterns = 0;
     dmMsg(1, "Unused patterns: ");
-        
+
     for (i = 0; i <= jsetMaxPatterns; i++)
     if (m->patterns[i] != NULL)
     {
@@ -779,12 +783,14 @@
         }
     }
     dmPrint(2, "\n");
-    
+
     dmMsg(1, "%d used patterns, %d unused.\n",
-    r->npatterns, m->npatterns - r->npatterns);
+        r->npatterns, m->npatterns - r->npatterns);
     
     
+    //
     // Re-map instruments
+    //
     dmMsg(1, "Unused instruments: ");
     for (n8 = n16 = i = 0; i < jsetMaxInstruments; i++)
     if (m->instruments[i] != NULL)
@@ -811,7 +817,7 @@
     }
     dmPrint(2, "\n");
     dmMsg(1, "Total of (%d)  16-bit, (%d) 8-bit samples, (%d) instruments.\n",
-    n16, n8, r->ninstruments);
+        n16, n8, r->ninstruments);
     
     // Re-map ext.instruments
     dmMsg(1, "Unused ext.instruments: ");
@@ -821,7 +827,7 @@
         if (i >= m->nextInstruments && !optStripExtInstr)
         {
             dmErrorMsg("Ext.instrument 0x%x >= 0x%x, but used!\n",
-            i, m->nextInstruments);
+                i, m->nextInstruments);
         }
         else
         if (m->extInstruments[i] != NULL)
@@ -868,9 +874,10 @@
     }
     dmPrint(2, "\n");
     dmMsg(1, "%d extended instruments.\n", r->nextInstruments);
-    
-    
-    // Remap pattern instrument data
+
+    //
+    // Remap pattern data with remapped instrument data
+    //
     for (i = 0; i < r->npatterns; i++)
     {
         int row, channel;
@@ -892,7 +899,7 @@
             }
 
             JMPGETEFFECT(effect, n->effect);
-            
+
             switch (effect)
             {
                 case 'C': // Cxx = Set volume