Code cleanup
Merge pull request #7 from stenix71/patch-1

Code cleanup