Bed verification refactor