suppression setCoverAlbum
some cleaning & comments