MAINT: modularising benchmark functions