Reduce complexity in PKCS7 and update the README