Finish refactorisation