diff --git a/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/WebOfTrust.kt b/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/WebOfTrust.kt
index 3d80ab36..83398741 100644
--- a/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/WebOfTrust.kt
+++ b/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/WebOfTrust.kt
@@ -128,11 +128,7 @@ class WebOfTrust(private val certificateStore: PGPCertificateStore) {
             }
 
             // map user-ids to revocation states
-            val userIds = buildMap<String, RevocationState> {
-                cert.userIds.forEach {
-                    put(it, RevocationState(cert.getUserIdRevocation(it)))
-                }
-            }
+            val userIds = cert.userIds.associateWith { RevocationState(cert.getUserIdRevocation(it)) }
 
             val node = CertSynopsis(certFingerprint,
                     expirationDate,