[FOLD] tidy up static