Continue refactorisation and cleaning.