Cleaning up formating