Integrate improvements from Yelp fork

Including better method names, tests, and commenting