splitter refactorized a bit