Refactor review_options helper