Change walk method
Cleanup library