Code cleanup
Merge pull request #5 from ktzar/master

Code cleanup