Glorious refactoring of the favoritesservice