[FOLD] tidy up Stat