[hoist_failure] Clean up the code and correct minor errors

[hoist_failure] Clean up the code and correct minor errors #1946