cleanup matching logic prover (work in progress)

not ready for review yet