modify 2.6 function code style