refactor popstars