modify according to latest code style