diff --git a/attribute-endpoints-provider/src/main/java/de/ccc/hamburg/keycloak/attribute_endpoints/AttributeEndpointsResourceProvider.java b/attribute-endpoints-provider/src/main/java/de/ccc/hamburg/keycloak/attribute_endpoints/AttributeEndpointsResourceProvider.java
index f5c0dfb..448668e 100644
--- a/attribute-endpoints-provider/src/main/java/de/ccc/hamburg/keycloak/attribute_endpoints/AttributeEndpointsResourceProvider.java
+++ b/attribute-endpoints-provider/src/main/java/de/ccc/hamburg/keycloak/attribute_endpoints/AttributeEndpointsResourceProvider.java
@@ -51,16 +51,11 @@ public class AttributeEndpointsResourceProvider implements RealmResourceProvider
         AttributeExportContext ctx = new AttributeExportContext(attributeGroupName);
 
         List<String> attribute_list = ctx.users
-                .map(user -> {
-                    Stream<String> attributeStream = ctx.attributeNames.stream();
-
-                    attributeStream = attributeStream.map(attributeName -> ctx.MapUserAttribute(user, attributeName).toList())
-                            .flatMap(Collection::stream);
-
-                    return attributeStream
-                            .filter(attribute -> !attribute.isEmpty())
-                            .toList();
-                })
+                .map(user ->  ctx.attributeNames.stream()
+                            .map(attributeName -> ctx.MapUserAttribute(user, attributeName).toList())
+                            .flatMap(Collection::stream)
+                            .filter(attribute -> !attribute.isEmpty()).toList()
+                )
                 .flatMap(List::stream)
                 .filter(ctx.filter::matches)
                 .toList();