Some code clean + standards
Merge pull request #18 from miniche/clean-code-fix

Some code clean + standards