Refactor artist graphs