Merge pull request #210 from m1ch1/master

Code cleanup.