Refactor favorites