Resolves #1

Fixes a bug where links would get ended if the artist/song had an apostrophe in the name. Also cleaned the code up so it's readable.