MAINT: small changes to address PR comments