Cleaning code
Merge pull request #60 from felipeacsi/cleaning

Cleaning code