Aplicando refactor