Cleanup&Formating