[shitou] - refactor code