More refactored validators