favorites refactored