Refactor and tidy up of SpliceGraph