Small meaningless refactoring
Some logic simplification in demuxing part of the main script