Clean up spacing and tudeux