refactoring geral, issue #1