Some refactoring.
Correction of the warnings. Non more warnings (!!!)