diff --git a/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd b/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd
index 6d73d912b..94adaafd2 100644
--- a/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd
+++ b/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd
@@ -10,36 +10,30 @@
   <import namespace="urn:ietf:params:xml:ns:domain-1.0" />
 
   <annotation>
-    <documentation>Extensible Provisioning Protocol
-    v1.0 extension schema for fee
-    information.</documentation>
+    <documentation>
+      Extensible Provisioning Protocol v1.0 Fee Extension
+    </documentation>
   </annotation>
 
-  <!--
-  Child elements found in EPP commands and responses
-  -->
-  <element name="check"    type="fee:checkType" />
-  <element name="chkData"  type="fee:chkDataType" />
-  <element name="create"   type="fee:transformCommandType" />
-  <element name="creData"  type="fee:transformResultType" />
-  <element name="renew"    type="fee:transformCommandType" />
-  <element name="renData"  type="fee:transformResultType" />
+  <!-- Child elements found in EPP commands and responses -->
+  <element name="check" type="fee:checkType" />
+  <element name="chkData" type="fee:chkDataType" />
+  <element name="create" type="fee:transformCommandType" />
+  <element name="creData" type="fee:transformResultType" />
+  <element name="renew" type="fee:transformCommandType" />
+  <element name="renData" type="fee:transformResultType" />
   <element name="transfer" type="fee:transformCommandType" />
-  <element name="trnData"  type="fee:transferResultType" />
-  <element name="update"   type="fee:transformCommandType" />
-  <element name="updData"  type="fee:transformResultType" />
-  <element name="delData"  type="fee:transformResultType" />
+  <element name="trnData" type="fee:transferResultType" />
+  <element name="update" type="fee:transformCommandType" />
+  <element name="updData" type="fee:transformResultType" />
+  <element name="delData" type="fee:transformResultType" />
 
-  <!--
-  client <check> command
-  -->
+  <!-- client <check> command -->
   <complexType name="checkType">
     <sequence>
-      <element name="currency"
-        type="fee:currencyType"
+      <element name="currency" type="fee:currencyType"
         minOccurs="0" />
-      <element name="command"
-  type="fee:commandCheckType"
+      <element name="command" type="fee:commandCheckType"
         maxOccurs="unbounded" />
     </sequence>
   </complexType>
@@ -61,17 +55,9 @@
     <attribute name="subphase" type="token" />
   </complexType>
 
-  <!--
-  server <check> result
-  -->
+  <!-- server <check> result -->
   <complexType name="chkDataType">
     <sequence>
-      <!--
-      Dialog is ongoing with Gavin Brown about this. His XSD has a
-      mandatory currency field. But what if the different domains being
-      checked have different currencies? I am trying to figure out what
-      he intends here. - Brian
-      -->
       <element name="currency" type="fee:currencyType" minOccurs="0"/>
       <element name="cd" type="fee:objectCDType"
         maxOccurs="unbounded" />
@@ -123,9 +109,7 @@
     <attribute name="subphase" type="token" />
   </complexType>
 
-  <!--
-    general transform (create, renew, update, transfer) command
-  -->
+  <!-- general transform (create, renew, update, transfer) command-->
   <complexType name="transformCommandType">
     <sequence>
       <element name="currency" type="fee:currencyType"
@@ -137,9 +121,7 @@
     </sequence>
   </complexType>
 
-  <!--
-    general transform (create, renew, update, delete) result
-  -->
+  <!-- general transform (create, renew, update, delete) result -->
   <complexType name="transformResultType">
     <sequence>
       <element name="currency" type="fee:currencyType" />
@@ -154,9 +136,7 @@
     </sequence>
   </complexType>
 
-  <!--
-    transfer result
-  -->
+  <!-- transfer result -->
   <complexType name="transferResultType">
     <sequence>
       <element name="currency" type="fee:currencyType" />
@@ -169,7 +149,6 @@
         maxOccurs="unbounded" />
       <element name="credit" type="fee:creditType"
         minOccurs="0" maxOccurs="unbounded" />
-
       <element name="balance" type="fee:balanceType"
         minOccurs="0" />
       <element name="creditLimit" type="fee:creditLimitType"
@@ -177,9 +156,7 @@
     </sequence>
   </complexType>
 
-  <!--
-    common types
-  -->
+  <!-- common types -->
   <simpleType name="currencyType">
     <restriction base="string">
       <pattern value="[A-Z]{3}" />