Cleaned code
Merge pull request #12 from carlonzo/develop.cleaning

Cleaned code