Checkpoint
Nits
Move definition of CertificateVerify