And clean up formating