Some formating improvements