some refactoring
Merge pull request #10 from kuzentio/refactor

some refactoring