UnSkipOnFail: code cleaning and improving
UnSkipOnFail: code cosmetics and fixes