First commit
Semplification of the code.