Refactor _builderFunc
Merge pull request #61 from golyshevd/refactor

Refactor _builderFunc