Refactor single base class