Refactor snapshot state verification