updated to clean code
Merge pull request #40 from c4ssio/master

updated to clean code