Refactoring: Around validation syntaxes in the models

also lambda syntax in couple of instances