Minor code cleanup in RootVC and Favorites VC.