Formating Cleanup