Code cleanup
Merge pull request #129 from mairbek/code-cleanup

Code cleanup