Refactored MakeChoice