refactoring on ArtistModel and ArtistDataSource