Refactor choices.