minor refactor
eventuais problemas