ENH: addressing @adamrp's comments