Cleaned code so that artist and album strings are handled consistently.