Simplify Walk_Finished procedure