Refactor and limit verification