refactor in review module