Cleanup, can work on performance side of pathfinder now