[updated] code minor refactoring
[updated] helper lib