some code cleanup, can finally delete now
Favorite functionality done