revise the unfold() of for statement