Refactored verification method