Refactor spliter partial