[update] Code optimization