Iniciado refactoring.