Changed some output formating