Code refactoring
Merge pull request #38 from piotrglazar/feature/cleanup

Code refactoring