Yelp refactor

@mendoncakr Just a little refactor. :)