DOC: Address @AlexandreAbraham's comments