Refactor of currAndNext.