Refactor Validators