MAINT: stats: a bit clean up