Formating improvements