Optimize helper
Merge pull request #5 from ZenCocoon/helper

Optimize helper