Refactor to use more of the review table class