diff --git a/lastfm_wrapper.py b/lastfm_wrapper.py
index 7adc4f3..00d0bb2 100644
--- a/lastfm_wrapper.py
+++ b/lastfm_wrapper.py
@@ -22,7 +22,9 @@ class LastFM:
                 }
                 
             async with ClientSession() as session:                
-                async with session.get(f"{self.api_base_url}artist.getinfo&artist={artist}&api_key={self.creds.get('key')}&autocorrect=1&format=json",  timeout=ClientTimeout(connect=3, sock_read=8)) as request:
+                async with session.get(f"{self.api_base_url}artist.getinfo&artist={artist} \
+                                       &api_key={self.creds.get('key')}&autocorrect=1&format=json",
+                                       timeout=ClientTimeout(connect=3, sock_read=8)) as request:
                     assert request.status in [200, 204]
                     data = await request.json()
                     data = data.get('artist')
@@ -51,7 +53,10 @@ class LastFM:
                 }
 
             async with ClientSession() as session:
-                async with session.get(f"{self.api_base_url}track.getInfo&api_key={self.creds.get('key')}&autocorrect=1&artist={artist}&track={track}&format=json",  timeout=ClientTimeout(connect=3, sock_read=8)) as request:
+                async with session.get(f"{self.api_base_url}track.getInfo&api_key={self.creds.get('key')} \
+                                       &autocorrect=1&artist={artist}&track={track} \
+                                        &format=json",
+                                        timeout=ClientTimeout(connect=3, sock_read=8)) as request:
                     assert request.status in [200, 204]
                     data = await request.json()
                     data = data.get('track')
@@ -98,7 +103,9 @@ class LastFM:
                 }
             
             async with ClientSession() as session:
-                async with session.get(f"{self.api_base_url}artist.gettopalbums&artist={artist}&api_key={self.creds.get('key')}&autocorrect=1&format=json",  timeout=ClientTimeout(connect=3, sock_read=8)) as request:
+                async with session.get(f"{self.api_base_url}artist.gettopalbums&artist={artist} \
+                                       &api_key={self.creds.get('key')}&autocorrect=1&format=json",
+                                        timeout=ClientTimeout(connect=3, sock_read=8)) as request:
                     assert request.status in [200, 204]
                     # return request.text
                     data = await request.json()
@@ -145,7 +152,9 @@ class LastFM:
                 }
             
             async with ClientSession() as session:
-                async with session.get(f"{self.api_base_url}artists/{artist_id}?key={self.creds.get('key')}&secret={self.creds.get('secret')}",  timeout=ClientTimeout(connect=3, sock_read=8)) as request:
+                async with session.get(f"{self.api_base_url}artists/{artist_id}?key={self.creds.get('key')} \
+                                       &secret={self.creds.get('secret')}",
+                                       timeout=ClientTimeout(connect=3, sock_read=8)) as request:
                     assert request.status in [200, 204]
                     data = await request.json()
                     
@@ -173,7 +182,7 @@ class LastFM:
             #     return {
             #         'err': Failed
             #     }
-            artist_info = await self.get_artist_info_by_id(artist_id=artist_id)
+            artist_info = await self.get_artist_info_by_id(artist_id=artist)
             if artist_info is None:
                 return {
                     'err': Failed
@@ -193,7 +202,10 @@ class LastFM:
                 }
             
             async with ClientSession() as session:
-                async with session.get(f"{self.api_base_url}album.getinfo&artist={artist}&album={album}&api_key={self.creds.get('key')}&autocorrect=1&format=json",  timeout=ClientTimeout(connect=3, sock_read=8)) as request:
+                async with session.get(f"{self.api_base_url}album.getinfo&artist={artist} \
+                                       &album={album}&api_key={self.creds.get('key')} \
+                                        &autocorrect=1&format=json",
+                                        timeout=ClientTimeout(connect=3, sock_read=8)) as request:
                     assert request.status in [200, 204]
                     data = await request.json()
                     data = data.get('album')