Refactor validators and specs