Improve SplitIRI code
6 files changed