Refactored out splittable concern