Refactor splitter