Unnecessary imports removed.
For albums, prefer the album artist. Some clean-up done.