Refactor to prepar for splitting model