First cleanup
Merge pull request #79 from danizord/hotfix/cleanup

Limpeza