Minor refactory of OptionPrompt