MAINT: address comments