MAINT: simplified