*8973* refactor reviewer form handler