refact utils a bit
Merge pull request #6 from innokenty-shuvalov/master

refact utils a bit