diff --git a/lib/music_brainz/release_group_search_result.ex b/lib/music_brainz/release_group_search_result.ex
index e51408b7..08c126ac 100644
--- a/lib/music_brainz/release_group_search_result.ex
+++ b/lib/music_brainz/release_group_search_result.ex
@@ -9,10 +9,7 @@ defmodule MusicBrainz.ReleaseGroupSearchResult do
       id: rg["id"],
       type: ReleaseGroup.parse_type(rg["primary-type"]),
       title: rg["title"],
-      artists:
-        rg["artist-credit"]
-        |> Enum.map(fn ac -> ac["artist"]["name"] end)
-        |> Enum.join(", "),
+      artists: Enum.map_join(rg["artist-credit"], ", ", fn ac -> ac["artist"]["name"] end),
       release: rg["first-release-date"]
     }
   end
diff --git a/lib/music_brainz/release_search_result.ex b/lib/music_brainz/release_search_result.ex
index 9970a573..99bf51c5 100644
--- a/lib/music_brainz/release_search_result.ex
+++ b/lib/music_brainz/release_search_result.ex
@@ -9,10 +9,7 @@ defmodule MusicBrainz.ReleaseSearchResult do
       id: r["id"],
       title: r["title"],
       release_group: parse_release_group(r["release-group"]),
-      artists:
-        r["artist-credit"]
-        |> Enum.map(fn ac -> ac["artist"]["name"] end)
-        |> Enum.join(", "),
+      artists: Enum.map_join(r["artist-credit"], ", ", fn ac -> ac["artist"]["name"] end),
       date: r["date"],
       barcode: r["barcode"],
       media: parse_media(r["media"])
diff --git a/lib/music_library/records.ex b/lib/music_library/records.ex
index d4f373ee..48f977e4 100644
--- a/lib/music_library/records.ex
+++ b/lib/music_library/records.ex
@@ -147,10 +147,7 @@ defmodule MusicLibrary.Records do
   end
 
   def populate_genres(record) do
-    artists =
-      record.artists
-      |> Enum.map(fn a -> a.name end)
-      |> Enum.join(",")
+    artists = Enum.map_join(record.artists, ",", fn a -> a.name end)
 
     completion = %OpenAI.Completion{
       content: """