Started refactor of review process