Added a favorite route and some minor code cleanup