[update:] minor refactor