ENH: Addressing comments by reviewer @jaberg