diff --git a/xep-0255.xml b/xep-0255.xml
index 611289a2..75fddc56 100644
--- a/xep-0255.xml
+++ b/xep-0255.xml
@@ -10,14 +10,12 @@
   <abstract>This specification defines an XMPP protocol extension for querying a compliant server for information about the geographical or physical location of an entity."</abstract>
   &LEGALNOTICE;
   <number>0255</number>
-
   <status>Experimental</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
   <approver>Council</approver>
   <dependencies>
     <spec>XMPP Core</spec>
-
   </dependencies>
   <supersedes/>
   <supersededby/>
@@ -25,7 +23,6 @@
   <author>
     <firstname>Helge</firstname>
     <surname>Timenes</surname>
-
     <email>helge@buddycloud.com</email>
     <jid>helge@buddycloud.com</jid>
   </author>
@@ -33,7 +30,6 @@
     <firstname>Simon</firstname>
     <surname>Tennant</surname>
     <email>simon@buddycloud.com</email>
-
     <jid>simon@buddycloud.com</jid>
   </author>
   <author>
@@ -41,17 +37,12 @@
     <surname>Savage</surname>
     <email>ross@buddycloud.com</email>
     <jid>ross@buddycloud.com</jid>
-
   </author>
   <revision>
     <version>0.4</version>
     <date>2009-01-06</date>
     <initials>ht</initials>
-    <remark>
-      <ul>
-        <li>Updated schema to reflect changes made in previous revision.</li>
-      </ul>
-    </remark>
+    <remark><p>Updated schema to reflect changes made in previous revision.</p></remark>
   </revision>
   <revision>
     <version>0.3</version>
@@ -751,36 +742,36 @@
                     type='xs:decimal'/>
         <xs:element name='beacons'   
                     minOccurs='0' 
-                    maxOccurs='unbounded'>
-          <xs:complexType>
-    	    <xs:sequence minOccurs='1' maxOccurs='1'>
-              <xs:element name='id'   
-                          minOccurs='1' 
-                          maxOccurs='1' 
-                          type='xs:string'/>
-              <xs:element name='type' 
-                          minOccurs='1' 
-                          maxOccurs='1' 
-                          type='xs:string'/>
-              <xs:element name='signalstrength' 
-                          minOccurs='0' 
-                          maxOccurs='1' 
-                          type='xs:int'/>
-              <xs:element name='timestamp' 
-                          minOccurs='0' 
-                          maxOccurs='1' 
-                          type='xs:datetime'/>
-            </xs:sequence>
-    	  </xs:complexType>
-        </xs:element>
+                    maxOccurs='unbounded'
+                    type='beaconsType'/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
 
+  <xs:complexType name='beaconsType'>
+    <xs:sequence minOccurs='1' maxOccurs='1'>
+      <xs:element name='id'
+                  minOccurs='1'
+                  maxOccurs='1'
+                  type='xs:string'/>
+      <xs:element name='type'
+                  minOccurs='1'
+                  maxOccurs='1'
+                  type='xs:string'/>
+      <xs:element name='signalstrength'
+                  minOccurs='0'
+                  maxOccurs='1'
+                  type='xs:int'/>
+      <xs:element name='timestamp'
+                  minOccurs='0'
+                  maxOccurs='1'
+                  type='xs:datetime'/>
+    </xs:sequence>
+  </xs:complexType>
+
 </xs:schema>
   ]]></code>
-  <p>Schema for the location results are given by <cite>XEP-0080</cite>.</p>
-
+  <p>Note: the schema for the location results is given by <cite>XEP-0080</cite>.</p>
 </section1>
 
 </xep>