Refactored review feature