Refactor geral