refactored choice -> option