Minor clean up
New splitter algorythm