Refactored duplicated code in sibling sub-classes