Refactor split again.