Code refactoring
Merge pull request #19 from piotrglazar/feature/code-refactoring

Code refactoring