MAINT/ENH: addressed remaining comments from @jairideout