Refactor validators.