refactoring, verification changes