chnage older coding style to newer