This should be a separate patch. Splitter structure is quite complicated, in this case, should not be combined change functionality and refactoring. Pullrequest will be difficult to review.