Rewrote LocationFinder methods, code reformatting in Pathfinder