Code cleaning and refactoring without side effect.

15 months ago, Edouard Tisserant