refactor reviewer form handler