Refactor code
Merge pull request #13 from OlegLazaryev/refactor

Refactor code