Sort out some whitespace