restructuring the output a little