CertImporter code review updates