some code cleaning
Merge pull request #16 from ofayans/master

some code cleaning