ENH: address @arjoly comments