refactoring favourites