Improved of the code sintax.