More refactorings

The saving of the validation could still be extracted to another method
I also removed saving the validation in the  variable, since
the fied is fechted from the database again