Refactoring Code - Favorites

Complete and Continue