diff --git a/src/defs.txt b/src/defs.txt
index 6b9f328..0c41954 100644
--- a/src/defs.txt
+++ b/src/defs.txt
@@ -23,39 +23,37 @@ actor -2265 10 0 suit
     alive yes
     pronoun it
 
-actor 0 0 0 error
-
 chat error
-    name "ERROR"
-    msg 0 "INIT" "EXIT" "Unspecified conversation ID"
+    name ERROR
+    msg 0 INIT EXIT "Unspecified conversation ID"
 
 chat hi_icarus
-    name "Icarus"
-    msg 2 "INIT" "hi" "Requesting permission to communicate..."
-        lvl "info"
-    msg 4 "hi" "vr" "Oh hey there!"
-        choice 3 "vr" "vr1" "Uhm... hi"
-            msg 8 "vr1" "notsochatty" "Didn't even notice you! Was playing some VR Game! What's up?"
-    msg 8 "vr" "notsochatty" "Didn't even notice you! Was playing some VR Game! What's up?"
-        choice 3 "notsochatty" "imgood" "I'm good, how are you?"
-            msg 5.5 "imgood" "pizza" "Are you sure? Your suit is sending a distress call. But whatever you say, have fun!"
-        choice 3 "notsochatty" "imbad" "Uhm... where am I? I don't feel so good."
-            msg 5.5 "imbad" "pizza" "Yeah I can imagine, looks like your suit is leaking. Take care!"
-    msg 3.5 "notsochatty" "pizza" "Not so chatty, huh? That's ok. See you around."
-    msg 2.5 "pizza" "end" "Make sure to check out the Pizza place."
-        choice 3 "end" "end1" "Will do, bye!"
-            msg 0 "end1" "EXIT" "Disconnected."
-    msg 0 "end" "EXIT" "Disconnected."
-        lvl "info"
+    name Icarus
+    msg 2 INIT hi "Requesting permission to communicate..."
+        lvl info
+    msg 4 hi vr "Oh hey there!"
+        choice 3 vr vr1 "Uhm... hi"
+            msg 8 vr1 "notsochatty" "Didn't even notice you! Was playing some VR Game! What's up?"
+    msg 8 vr notsochatty "Didn't even notice you! Was playing some VR Game! What's up?"
+        choice 3 notsochatty imgood "I'm good, how are you?"
+            msg 5.5 imgood pizza "Are you sure? Your suit is sending a distress call. But whatever you say, have fun!"
+        choice 3 notsochatty imbad "Uhm... where am I? I don't feel so good."
+            msg 5.5 imbad pizza "Yeah I can imagine, looks like your suit is leaking. Take care!"
+    msg 3.5 notsochatty pizza "Not so chatty, huh? That's ok. See you around."
+    msg 2.5 pizza end "Make sure to check out the Pizza place."
+        choice 3 end end1 "Will do, bye!"
+            msg 0 end1 EXIT "Disconnected."
+    msg 0 end EXIT "Disconnected."
+        lvl info
 
-chat "pizzeria"
+chat pizzeria
     name "Space Pizza™"
-    msg 2 "INIT" "hi" "Requesting permission to communicate..."
-        lvl "info"
-    msg 5 "hi" "order" "Welcome to Space Pizza™, best pizza all across the Jovian rings!"
-    msg 10 "order" "anyone" "Would you like to order today's special Miracle Spacefungi?  Freshly blended pizza smoothie ready for your space suit feeding tube!"
-        choice 3 "anyone" "yourloss" "Pizza... smoothie? I think I'll pass..."
-            msg 3 "yourloss" "end" "Your loss, mate"
-    msg 10 "anyone" "end" "Hello? Is anyone there? Is this a prank?"
-    msg 0 "end" "EXIT" "Disconnected."
-        lvl "info"
+    msg 2 INIT hi "Requesting permission to communicate..."
+        lvl info
+    msg 5 hi order "Welcome to Space Pizza™, best pizza all across the Jovian rings!"
+    msg 10 order anyone "Would you like to order today's special Miracle Spacefungi?  Freshly blended pizza smoothie ready for your space suit feeding tube!"
+        choice 3 anyone yourloss "Pizza... smoothie? I think I'll pass..."
+            msg 3 yourloss end "Your loss, mate"
+    msg 10 anyone end "Hello? Is anyone there? Is this a prank?"
+    msg 0 end EXIT "Disconnected."
+        lvl info