MAINT: minor reorg