Fix issue in walk the path posible error
Minor cleanup of methods.