MAINT: Review changes