Fix issues in rst document + remove Choice