Minor inheritance refactoring