Refactor validators