[update:] impove code quality