2prev, refactoring