some tidying
Merge pull request #7 from kostyak76/master

some tidying