Refactor the place finder.