code cleaning
Merge pull request #9 from Neonunux/master

code cleaning