Code cleanup
Merge pull request #1 from Dzakus/patch-1

Code cleanup