Refactor Validator