refactor: rework options flow to have a more consistent pattern

[comtalyst]

Fixes #

Description

How was this change tested?

*

Does this change impact docs?

• [ ] Yes, PR includes docs updates
• [ ] Yes, issue opened: #
• [ ] No

Release Note