Cleaning and fixing the code.

Signed-off-by: Stéphane Galland <galland@arakhne.org>