refactored admin and reviewer logic