Use constructor for SplitInfo to reduce code repetition
Update TODOs
Formatting fixes