refactor of artists code