Code simplification (OStr instead of Output [OStr]).