Refactoring extracting Super and overriding