diff --git a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilderInterface.java b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilderInterface.java
index 3039f29e..a2b8db8b 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilderInterface.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionBuilderInterface.java
@@ -105,7 +105,8 @@ public interface EncryptionBuilderInterface {
 
         /**
          * Encrypt for the given valid public key.
-         * TODO: Explain the difference between this and {@link #toRecipient(PGPPublicKeyRing, String)}.
+         * With this method, the recipient key is being addressed by key-id,
+         * so this method prioritizes algorithm preferences from the keys direct-key signature.
          *
          * @param key recipient key for which the message will be encrypted.
          * @return api handle
@@ -134,8 +135,8 @@ public interface EncryptionBuilderInterface {
 
         /**
          * Encrypt for all valid public keys in the provided collection.
-         * If any key is not eligible for encryption (e.g. expired, revoked...), an exception will be thrown.
-         * TODO: which exception?
+         * If any key is not eligible for encryption (e.g. expired, revoked...),
+         * an {@link IllegalArgumentException} will be thrown.
          *
          * @param keys collection of public keys
          * @return api handle
diff --git a/pgpainless-core/src/main/java/org/pgpainless/implementation/BcImplementationFactory.java b/pgpainless-core/src/main/java/org/pgpainless/implementation/BcImplementationFactory.java
index 2191c308..418c9628 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/implementation/BcImplementationFactory.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/implementation/BcImplementationFactory.java
@@ -153,7 +153,6 @@ public class BcImplementationFactory extends ImplementationFactory {
                 .build(passphrase.getChars());
     }
 
-    // TODO: Find a better conversion method that does not depend on JcaPGPKeyPair.
     private AsymmetricCipherKeyPair jceToBcKeyPair(PublicKeyAlgorithm algorithm,
                                                    KeyPair keyPair,
                                                    Date creationDate) throws PGPException {