Cleaning code
Merge pull request #28 from Garfield-fr/clean-code

Cleaning code