More refactoring stabilisation