clean Validator class
correct template