Refactors answer yes/no to wrap multiple-choice