Refactor reviewers
Refactor randomization