diff --git a/president-travels/kennedy-john-f.xml b/president-travels/kennedy-john-f.xml
index 57d299b..c5a77f4 100644
--- a/president-travels/kennedy-john-f.xml
+++ b/president-travels/kennedy-john-f.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <trips>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2776</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -14,7 +14,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2777</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -22,13 +22,14 @@
         <end-date>1961-06-03</end-date>
         <country id="france">France</country>
         <locale>Paris</locale>
-        <remarks>State visit; addressed North Atlantic Council and met with President De Gaulle.</remarks>
+        <remarks>State visit; addressed North Atlantic Council and met with President De
+            Gaulle.</remarks>
         <created-by>wicentowskijc</created-by>
         <created-datetime>2010-02-27T14:35:48.889-04:00</created-datetime>
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2778</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -36,13 +37,13 @@
         <end-date>1961-06-04</end-date>
         <country id="austria">Austria</country>
         <locale>Vienna</locale>
-        <remarks>Met with President Sehaerf and held talks with Soviet Premier Khrushchev.</remarks>
+        <remarks>Met with President Schaerf and held talks with Soviet Premier Khrushchev.</remarks>
         <created-by>wicentowskijc</created-by>
         <created-datetime>2010-02-27T14:35:48.889-04:00</created-datetime>
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2779</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -56,7 +57,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2780</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -70,7 +71,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2781</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -84,7 +85,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2782</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -98,7 +99,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2783</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -112,7 +113,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2784</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -120,13 +121,14 @@
         <end-date>1962-12-21</end-date>
         <country id="united-kingdom">United Kingdom</country>
         <locale>Nassau (The Bahamas)</locale>
-        <remarks>Conferred with Prime Minister Macmillan; concluded Nassau agreement on nuclear defense systems.</remarks>
+        <remarks>Conferred with Prime Minister Macmillan; concluded Nassau agreement on nuclear
+            defense systems.</remarks>
         <created-by>wicentowskijc</created-by>
         <created-datetime>2010-02-27T14:35:48.889-04:00</created-datetime>
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2785</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -140,7 +142,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2786</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -154,7 +156,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2787</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -168,7 +170,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2788</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -182,7 +184,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2789</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -196,7 +198,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2790</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -210,7 +212,7 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-    <trip who="kennedy-john-f" role="president">
+    <trip role="president" who="kennedy-john-f">
         <id>2791</id>
         <role>president</role>
         <name>John F. Kennedy</name>
@@ -224,4 +226,4 @@
         <last-modified-by>wicentowskijc</last-modified-by>
         <last-modified-datetime>2010-02-27T14:35:48.889-04:00</last-modified-datetime>
     </trip>
-</trips>
\ No newline at end of file
+</trips>