diff --git a/Persephone/DataSources/QueueDataSource.swift b/Persephone/DataSources/QueueDataSource.swift
index 3313054..0158e15 100644
--- a/Persephone/DataSources/QueueDataSource.swift
+++ b/Persephone/DataSources/QueueDataSource.swift
@@ -18,14 +18,9 @@ class QueueDataSource: NSObject, NSOutlineViewDataSource {
   let pauseIcon = NSImage(named: "pauseButton")
 
   func updateQueue(_ queue: [MPDClient.Song]) {
-    var newQueue: [SongItem] = []
-
-    for (index, mpdSong) in queue.enumerated() {
-      let songItem = SongItem(song: mpdSong, queuePos: index, isPlaying: index == queuePos)
-      newQueue.append(songItem)
+    self.queue = queue.enumerated().map { index, song in
+      SongItem(song: song, queuePos: index, isPlaying: index == queuePos)
     }
-
-    self.queue = newQueue
   }
 
   func setQueuePos(_ queuePos: Int) {