Refactor double verifier