Code refactoring Antoine Michel.