Improve use of Splitter in Atmos code