Refactor some proofs