Enhanced output formating