eliminado refucktor
Some minor changes