Some formating chnages