improve: remove redundancy
improve: small change
Merge