ENH: Incorporated mwaskom's suggestions