Refactoring to remove any global objects
Wrapping up the remaining unit tests
Restoring Yelp calls