Refactor restaurant stuffs