ENH: address @jakevdp comments (2)