Maybe(?) simplify output creation