Small refactoring...
Merge pull request #24 from SlavaRa/refactoring

Small refactoring...