Refactor super class.