Restructured output a bit