[update:] code improvement