DOC: address @mblondel's comments