diff --git a/FormalSystems/Chomsky/Grammar.lean b/FormalSystems/Chomsky/Grammar.lean
index 452632a..0716e2f 100644
--- a/FormalSystems/Chomsky/Grammar.lean
+++ b/FormalSystems/Chomsky/Grammar.lean
@@ -305,56 +305,37 @@ def Derivation.len { u w: Word (G.V ⊕ G.Z) }: G.Derivation u w → Nat
 
 namespace Derivation
 
-/--Theorem: It is possible to augment a prefix-word`w`to the left side of in- and output of a
-  valid derivation. We recieve a valid derivation.-/
-theorem augment_left {u v w: Word _} (d: G.Derivation u v) :
-  G.Derivation (w * u) (w * v) := by
-  induction d with
-  | same h => apply same; simp [h]
-  | step s _ sound =>
-    apply step
-    . assumption
-    swap
-    . exact s.augment_left w
-    . rw [<- sound]; exact s.augment_left_result _
+/--Return a derivation where we have added a new prefix-word`w`to the left side of in- and output of a
+  valid derivation.-/
+def augment_left {u v w: Word _} (d: G.Derivation u v) :
+  G.Derivation (w * u) (w * v) :=
+  match d with
+  | same h => Derivation.same (by rw [h])
+  | step s d sound => Derivation.step (s.augment_left w) d.augment_left (by rw [← sound]; apply s.augment_left_result)
 
 /--Return a derivation where we have added a new prefix-symbol`w`to the left sides of in-
   and output of the input derivation.-/
 def augment_left_cons {u v: Word _} (d: G.Derivation u v) :
-  G.Derivation (w :: u) (w :: v) := by
+  G.Derivation (w :: u) (w :: v) :=
   match d with
-  | same h => apply same; simp [h]
-  | step s d' sound =>
-    apply step
-    . exact d'.augment_left_cons
-    swap
-    . exact s.augment_left [w]
-    . rw [<- sound]; exact s.augment_left_result _
+  | same h => Derivation.same (by rw [h])
+  | step s d sound => Derivation.step (s.augment_left [w]) d.augment_left_cons (by rw [← sound]; apply s.augment_left_result)
 
 /--Return a derivation where we have added a new prefix-word`w`to the right sides of in-
   and output of the input derivation.-/
-theorem augment_right {u v: Word (G.V ⊕ G.Z)} (d: G.Derivation u v) :
-  G.Derivation (u * w) (v * w) := by induction d with
-  | same h => apply same; simp [h]
-  | step s _ sound =>
-    apply step
-    .assumption
-    swap
-    . exact s.augment_right w
-    rw [<- sound]; exact s.augment_right_result _
+def augment_right {u v: Word (G.V ⊕ G.Z)} (d: G.Derivation u v) :
+  G.Derivation (u * w) (v * w) :=
+  match d with
+  | same h => Derivation.same (by rw [h])
+  | step s d sound => Derivation.step (s.augment_right w) d.augment_right (by rw [← sound]; apply s.augment_right_result)
 
 /--Return a derivation where we have added a new prefix-symbol`w`to the right sides of in-
   and output of the input derivation.-/
 def augment_right_cons {u v: Word (G.V ⊕ G.Z)} (d: G.Derivation u v) :
-  G.Derivation (u.append w) (v.append w) := by
+  G.Derivation (u.append w) (v.append w) :=
   match d with
-  | same h => apply same; simp [h]
-  | step s d' sound =>
-    apply step
-    . exact d'.augment_right_cons
-    swap
-    . exact s.augment_right w
-    . rw [<- sound]; exact s.augment_right_result _
+  | same h => Derivation.same (by rw [h])
+  | step s d sound => Derivation.step (s.augment_right w) d.augment_right_cons (by rw [← sound]; apply s.augment_right_result)
 
 /--Theorem: The derivation relation is transitive. This theorem can be used to return
   a transitive derivation.-/