Verifier Refactoring

Just some refactoring to get ready for reconciliation.