Refactor @verify