diff --git a/songs/Razorlight/America.sg b/songs/Razorlight/America.sg
index f11ace29..8ded3340 100644
--- a/songs/Razorlight/America.sg
+++ b/songs/Razorlight/America.sg
@@ -1,12 +1,13 @@
 \selectlanguage{english}
 \songcolumns{2}
-\beginsong{America}[by=Razorlight,cov=Razorlight,album=Razorlight]
+\beginsong{America}
+  [by=Razorlight,cov=Razorlight,album=Razorlight]
 
   \cover
   \gtab{A}{X02220}
-  \gtab{B}{2:x03330}
+  \gtab{B}{2:X03330}
   \gtab{E}{022100}
-  \gtab{D}{xx0232}
+  \gtab{D}{XX0232}
   \gtab{G}{320033}
 
   \begin{verse}
@@ -19,24 +20,24 @@
   \begin{verse*}
     \[A]I light a \[B]cigarette
     'Cause \[E]I can't get no \[A]sleep
-    \[A]Theres nothing on the TV \[B]nothing on the radio
+    \[A]There's nothing on the TV, \[B]nothing on the radio
     That \[E]means that much to \[A]me
   \end{verse*}
 
-  \beginchorus
-    \[A]All my \[B]life  \[E]
+  \begin{chorus}
+    \[A]All my \[B]life \[E]
     Watching \[A]America
     \[A]All my \[B]life \[E]
     There's panic in \[A]America
-    \[A]Oh Oh \[B]Oh, Oh\[E]
+    \[A]Oh, oh, \[B]oh, oh\[E]
     There's trouble in \[A]America
-    \[A]Oh Oh \[B]Oh, Oh\[E]
-  \endchorus
+    \[A]Oh, oh, \[B]oh, oh\[E]
+  \end{chorus}
 
   \begin{repeatedchords}
     \begin{verse}
       \[A]Yesterday \[B]was easy
-      Happiness\[E] came and \[A]went
+      Happiness \[E] came and \[A]went
       \[A]I got the \[B]movie script
       But I \[E]don't know what it\[A] meant
     \end{verse}
@@ -49,21 +50,9 @@
       \[A]Theres nothing on the TV \[B]nothing on the radio
       That I \[E]can believe \[A]in
     \end{verse*}
-
-    \beginchorus
-      \[A]All my \[B]life  \[E]
-      Watching \[A]America
-      \[A]All my \[B]life \[E]
-      There's panic in \[A]America
-      \[A]Oh Oh \[B]Oh, Oh\[E]
-      There's trouble in \[A]America
-      \[A]Oh Oh \[B]Oh, Oh\[E]
-      There's panic in \[A]America
-      \[A]Oh Oh \[B]Oh, Oh\[E]
-    \endchorus
   \end{repeatedchords}
 
-  \begin{verse}
+  \begin{bridge}
     \[A]Yester\[B]day was easy
     \[D]Yes I got the \[G]news
     \[A]When you \[B]get it straight, but \[D]stand up you just can't \[G]lose
@@ -71,28 +60,12 @@
     \[A]Dont stand me up
     \[B]Don't let me down
     \[E]I need you \[A]tonight
-    \[A]To hold \[B]me,\[E] say you'll \[A]be here
-    \[A]To hold \[B]me,\[E] say you'll \[A]be here
-    \[A]To hold \[B]me,\[E] say you'll \[A]be here
-    \[A]To hold..\[B]  \[E]
-  \end{verse}
+    \[A]To hold \[B]me,\[E] say you'll \[A]be here \rep{3}
+    \[A]To hold \dots\[B] \[E]
+  \end{bridge}
 
-  \begin{repeatedchords}
-    \beginchorus
-      \[A]All my \[B]life  \[E]
-      Watching \[A]America
-      \[A]All my \[B]life \[E]
-      There's panic in \[A]America
-      \[A]Oh Oh \[B]Oh, Oh\[E]
-      There's trouble in \[A]America
-      \[A]Oh Oh \[B]Oh, Oh\[E]
-      There's panic in \[A]America
-      \[A]Oh Oh \[B]Oh, Oh\[E]
-    \endchorus
-  \end{repeatedchords}
-
-  \begin{verse}
-    \[A]Tell me how does it \[B]feel\[E] \[A]\rep{4}
-  \end{verse}
+  \begin{verse*}
+    \[A]Tell me how does it \[B]feel\[E] \[A] \rep{4}
+  \end{verse*}
 
-\endsong
\ No newline at end of file
+\endsong