MAINT: stats: a bit of clean up