Refactoring to easy overrides