Splitter refactoring