refactoring YELP