improve splitter appearance; prepare for extracting source refs