cleaned up pathfinder