diff --git a/lib/artist.go b/lib/artist.go
index 8a5454b..1060d9b 100644
--- a/lib/artist.go
+++ b/lib/artist.go
@@ -45,9 +45,9 @@ func parseMoreButton(raw gjson.Result, v string) MoreItem {
 
 	return MoreItem{
 		BrowseId: nav.Get("browseEndpoint.browseId").String(),
-		Params: nav.Get("browseEndpoint.params").String(),
-		Click:  nav.Get("clickTrackingParams").String(),
-		Visit:  v,
+		Params:   nav.Get("browseEndpoint.params").String(),
+		Click:    nav.Get("clickTrackingParams").String(),
+		Visit:    v,
 	}
 }
 
diff --git a/lib/common.go b/lib/common.go
index bfccf8b..e38f97c 100644
--- a/lib/common.go
+++ b/lib/common.go
@@ -205,7 +205,7 @@ func ResponsiveListItemRendererCH(s gjson.Result) []Item {
 }
 
 func NavigationButton(s gjson.Result) []Item {
-	size :=  s.Get("#").Int()
+	size := s.Get("#").Int()
 	r := make([]Item, size)
 
 	wg := sync.WaitGroup{}
diff --git a/lib/next.go b/lib/next.go
index bbe82e5..209467f 100644
--- a/lib/next.go
+++ b/lib/next.go
@@ -21,16 +21,15 @@ type Next struct {
 }
 
 func parseNextSongs(n gjson.Result) []Item {
+	panel := n.Get("#.playlistPanelVideoRenderer")
 
-	np := n.Get("#.playlistPanelVideoRenderer")
-
-	size := n.Get("#").Int()
+	size := np.Get("#").Int()
 	r := make([]Item, size)
 
 	wg := sync.WaitGroup{}
 	wg.Add(int(size))
 
-	np.ForEach(
+	panel.ForEach(
 		func(n, v gjson.Result) bool {
 			go func(i int64, j gjson.Result) {
 				defer wg.Done()
@@ -56,28 +55,28 @@ func parseNext(raw string) Next {
 
 	j := gjson.Parse(raw)
 
-	c := j.Get(
+	contents := j.Get(
 		"contents.singleColumnMusicWatchNextResultsRenderer.tabbedRenderer.watchNextTabbedResultsRenderer.tabs",
 	)
-	m := j.Get(
+	mediaSession := j.Get(
 		"playerOverlays.playerOverlayRenderer.browserMediaSession.browserMediaSessionRenderer",
 	)
 
-	n := c.Get(
+	upNext := contents.Get(
 		"#(tabRenderer.title == Up next).tabRenderer.content",
 	).Get("musicQueueRenderer.content.playlistPanelRenderer")
 
-	l := c.Get(
+	lyricsId := contents.Get(
 		"#(tabRenderer.title == Lyrics).tabRenderer.endpoint.browseEndpoint.browseId",
-	)
+	).String()
 
 	return Next{
-		LyricsId: l.String(),
+		LyricsId: lyricsId,
 		MediaSession: MediaSession{
-			Album:      RunsText(m.Get("album")),
-			Thumbnails: GetThumbnails(m.Get("thumbnailDetails.thumbnails")),
+			Album:      RunsText(mediaSession.Get("album")),
+			Thumbnails: GetThumbnails(mediaSession.Get("thumbnailDetails.thumbnails")),
 		},
-		Songs: parseNextSongs(n.Get("contents")),
+		Songs: parseNextSongs(upNext.Get("contents")),
 	}
 }