1 files changed, 4 insertions, 6 deletions

diff --git a/bank-eiffel/person.e b/bank-eiffel/person.e
index 54e1a45..9a2b281 100644
--- a/bank-eiffel/person.e
+++ b/bank-eiffel/person.e
@@ -14,11 +14,9 @@ feature -- Access
 
         surname: STRING_8 assign set_surname
                         -- Nachname
-                attribute Result := ({like surname}).default end --| Remove line when Void Safety is properly set
 
         firstname: STRING_8 assign set_firstname
                         -- Vorname
-                attribute Result := ({like firstname}).default end --| Remove line when Void Safety is properly set
 
 feature {NONE} -- Initialization
 
@@ -33,7 +31,7 @@ feature {NONE} -- Implementation
         set_surname (a_surname: like surname)
                         -- Assign `surname' with `a_surname'.
                 require
-                        a_surname_not_empty: a_surname /= Void and then not a_surname.is_empty
+                        a_surname_not_empty: not a_surname.is_empty
                 do
                         surname := a_surname
                 ensure
@@ -43,7 +41,7 @@ feature {NONE} -- Implementation
         set_firstname (a_firstname: like firstname)
                         -- Assign `firstname' with `a_firstname'.
                 require
-                        a_firstname_not_empty: a_firstname /= Void and then not a_firstname.is_empty
+                        a_firstname_not_empty: not a_firstname.is_empty
                 do
                         firstname := a_firstname
                 ensure
@@ -51,6 +49,6 @@ feature {NONE} -- Implementation
                 end
 
 invariant
-        firstname_not_empty: firstname /= Void and then not firstname.is_empty
-        surname_not_empty: surname /= Void and then not surname.is_empty
+        firstname_not_empty: not firstname.is_empty
+        surname_not_empty: not surname.is_empty
 end