Bunch of cleanup and moved from path = INT_MAX to path = 0;