Cleaned Up Pathfinding