Formating cleanup