[refactor] Helper optimization
[build] after refactoring