fit new code style