UnSkipOnFail: code cleaning and improving