More refactoring inheritance