Sort out whitespace