artist refactor