Tidied up #CHOICES notes