Improved formatting for WinPho issue