diff --git a/tools/hyphy/macros.xml b/tools/hyphy/macros.xml
index 5cbbb2ce676..c5b4c63e4a4 100644
--- a/tools/hyphy/macros.xml
+++ b/tools/hyphy/macros.xml
@@ -7,17 +7,28 @@
   <xml name="gencode">
     <param name="gencodeid" type="select" label="Genetic code">
       <option value="Universal">Universal code</option>
-      <option value="Vertebrate-mtDNA">Vertebrate mitochondrial DNA code</option>
-      <option value="Yeast-mtDNA">Yeast mitochondrial DNA code</option>
-      <option value="Mold-Protozoan-mtDNA">Mold, Protozoan and Coelenterate mt; Mycloplasma/Spiroplasma</option>
-      <option value="Invertebrate-mtDNA">Invertebrate mitochondrial DNA code</option>
-      <option value="Ciliate-Nuclear">Ciliate, Dasycladacean and Hexamita Nuclear code</option>
-      <option value="Echinoderm-mtDNA">Echinoderm mitochondrial DNA code</option>
-      <option value="Euplotid-Nuclear">Euplotid Nuclear code</option>
-      <option value="Alt-Yeast-Nuclear">Alternative Yeast Nuclear code</option>
-      <option value="Ascidian-mtDNA">Ascidian mitochondrial DNA code</option>
-      <option value="Flatworm-mtDNA,">Flatworm mitochondrial DNA code</option>
-      <option value="Blepharisma-Nuclear">Blepharisma Nuclear code</option>
+      <option value="Vertebrate-mtDNA">Vertebrate mitochondrial DNA
+      code</option>
+      <option value="Yeast-mtDNA">Yeast mitochondrial DNA
+      code</option>
+      <option value="Mold-Protozoan-mtDNA">Mold, Protozoan and
+      Coelenterate mt; Mycloplasma/Spiroplasma</option>
+      <option value="Invertebrate-mtDNA">Invertebrate mitochondrial
+      DNA code</option>
+      <option value="Ciliate-Nuclear">Ciliate, Dasycladacean and
+      Hexamita Nuclear code</option>
+      <option value="Echinoderm-mtDNA">Echinoderm mitochondrial DNA
+      code</option>
+      <option value="Euplotid-Nuclear">Euplotid Nuclear
+      code</option>
+      <option value="Alt-Yeast-Nuclear">Alternative Yeast Nuclear
+      code</option>
+      <option value="Ascidian-mtDNA">Ascidian mitochondrial DNA
+      code</option>
+      <option value="Flatworm-mtDNA">Flatworm mitochondrial DNA
+      code</option>
+      <option value="Blepharisma-Nuclear">Blepharisma Nuclear
+      code</option>
     </param>
   </xml>
   <xml name="branches">
@@ -25,7 +36,8 @@
       <option value="All">All branches</option>
       <option value="Internal">Internal branches</option>
       <option value="Leaves">Leaf branches</option>
-      <option value="'Unlabeled-branches'">Unlabeled branches</option>
+      <option value="'Unlabeled-branches'">Unlabeled
+      branches</option>
     </param>
   </xml>
   <xml name="citations">
@@ -37,7 +49,8 @@
   <token name="@VERSION@">2.5.0</token>
   <xml name="requirements">
     <requirements>
-      <requirement type="package" version="@VERSION@">hyphy</requirement>
+      <requirement type="package" version="@VERSION@">
+      hyphy</requirement>
       <yield/>
     </requirements>
   </xml>