clean up and formating