Code cleaning. No majour changes.