Minor cleanup
Also return the uri for the album art for tracks