Working extract super class refactoring