Sort out whitespace irregularities