moving output code to be more terse