ENH/STY: a few changes based on suggestions from @jairideout