MAINT: Actions from review