Cleanup the Formating